samba-lib64.patch

   1 --- samba-3.0.23b.org/source/torture/nsstest.c  2006-04-20 04:29:44.000000000 +0200
   2 +++ samba-3.0.23b/source/torture/nsstest.c      2006-08-09 21:19:38.922291250 +0200
   3 @@ -21,7 +21,7 @@
   4
   5  #include "includes.h"
   6
   7 -static const char *so_path = "/lib/libnss_winbind.so";
   8 +static const char *so_path = "/lib64/libnss_winbind.so";
   9  static const char *nss_name = "winbind";
  10  static int nss_errno;
  11  static NSS_STATUS last_error;
  12 --- samba-3.0.25a/source/aclocal.m4.orig        2007-03-01 05:55:17.000000000 +0100
  13 +++ samba-3.0.25a/source/aclocal.m4     2007-06-14 18:45:50.703496205 +0200
  14 @@ -268,20 +268,20 @@
  15    $1=[$]ac_new_flags
  16  ])
  17
  18 -dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
  19 -dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
  20 +dnl Removes '-L/usr/lib64[/]', '-Wl,-rpath,/usr/lib64[/]'
  21 +dnl and '-Wl,-rpath -Wl,/usr/lib64[/]' from given variable
  22  AC_DEFUN(LIB_REMOVE_USR_LIB,[
  23    ac_new_flags=""
  24    l=""
  25    for i in [$]$1; do
  26      case [$]l[$]i in
  27 -    -L/usr/lib) ;;
  28 -    -L/usr/lib/) ;;
  29 -    -Wl,-rpath,/usr/lib) ;;
  30 -    -Wl,-rpath,/usr/lib/) ;;
  31 +    -L/usr/lib64) ;;
  32 +    -L/usr/lib64/) ;;
  33 +    -Wl,-rpath,/usr/lib64) ;;
  34 +    -Wl,-rpath,/usr/lib64/) ;;
  35      -Wl,-rpath) l=[$]i;;
  36 -    -Wl,-rpath-Wl,/usr/lib) l="";;
  37 -    -Wl,-rpath-Wl,/usr/lib/) l="";;
  38 +    -Wl,-rpath-Wl,/usr/lib64) l="";;
  39 +    -Wl,-rpath-Wl,/usr/lib64/) l="";;
  40      *)
  41         s=" "
  42          if test x"[$]ac_new_flags" = x""; then
  43 @@ -429,9 +429,9 @@
  44  ])
  45
  46  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
  47 -dnl This function doesn't add -L/usr/lib into LDFLAGS
  48 +dnl This function doesn't add -L/usr/lib64 into LDFLAGS
  49  AC_DEFUN(LIB_ADD_DIR,[
  50 -if test "$2" != "/usr/lib" ; then
  51 +if test "$2" != "/usr/lib64" ; then
  52      $1="$$1 -L$2"
  53  fi
  54  ])
  55 --- samba-3.0.25a/source/configure.in.orig      2007-05-23 17:29:20.000000000 +0200
  56 +++ samba-3.0.25a/source/configure.in   2007-06-14 18:49:28.307646759 +0200
  57 @@ -31,7 +31,7 @@
  58  test "${mandir}" || mandir="\${prefix}/man"
  59  logfilebase="\${VARDIR}"
  60  privatedir="\${prefix}/private"
  61 -test "${libdir}" || libdir="\${prefix}/lib"
  62 +test "${libdir}" || libdir="\${prefix}/lib64"
  63  pammodulesdir="\${LIBDIR}/security"
  64  configdir="\${LIBDIR}"
  65  swatdir="\${prefix}/swat"
  66 @@ -45,7 +35,7 @@
  67      mandir="\${prefix}/share/man"
  68      logfilebase="\${VARDIR}/log/samba"
  69      privatedir="\${CONFIGDIR}/private"
  70 -    libdir="\${prefix}/lib/samba"
  71 +    libdir="\${prefix}/lib64/samba"
  72      configdir="\${sysconfdir}/samba"
  73      swatdir="\${DATADIR}/samba/swat"
  74      ;;
  75 @@ -1132,7 +1132,7 @@
  76      _cppflags=${CPPFLAGS}
  77
  78      # Add additional search path
  79 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
  80 +    LDFLAGS="-L$with_readline/lib64 $LDFLAGS"
  81      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  82
  83      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
  84 @@ -1143,7 +1143,7 @@
  85         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
  86        done
  87        AC_CHECK_LIB(readline, rl_callback_handler_install,
  88 -       [TERMLDFLAGS="-L$with_readline/lib"
  89 +       [TERMLDFLAGS="-L$with_readline/lib64"
  90         TERMCPPFLAGS="-I$with_readline/include"
  91         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  92         TERMLIBS="-lreadline $TERMLIBS"
  93 @@ -2337,7 +2337,7 @@
  94  ICONV_LOCATION=standard
  95  LOOK_DIRS="/usr /usr/local /sw /opt"
  96  AC_ARG_WITH(libiconv,
  97 -[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
  98 +[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
  99  [
 100    if test "$withval" = "no" ; then
 101      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
 102 @@ -2366,7 +2366,7 @@
 103  dnl library directory is there and check the ABI directory first (which
 104  dnl should be harmless on other systems.
 105  dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
 106 -    for l in "lib32" "lib" "lib/hpux32"; do
 107 +    for l in "lib32" "lib64" "lib/hpux32"; do
 108          if test -d "$i/$l" ; then
 109                  LDFLAGS="$save_LDFLAGS -L$i/$l"
 110          LIBS=
 111 @@ -3370,7 +3370,7 @@
 112          AC_MSG_RESULT($withval)
 113          KRB5_CFLAGS="-I$withval/include"
 114          KRB5_CPPFLAGS="-I$withval/include"
 115 -        KRB5_LDFLAGS="-L$withval/lib"
 116 +        KRB5_LDFLAGS="-L$withval/lib64"
 117          FOUND_KRB5=yes
 118         if test -x "$withval/bin/krb5-config"; then
 119                 KRB5CONFIG=$withval/bin/krb5-config
 120 @@ -3407,10 +3407,10 @@
 121      # see if this box has the SuSE location for the heimdal krb implementation
 122      AC_MSG_CHECKING(for /usr/include/heimdal)
 123      if test -d /usr/include/heimdal; then
 124 -      if test -f /usr/lib/heimdal/lib/libkrb5.a; then
 125 +      if test -f /usr/lib64/heimdal/lib/libkrb5.a; then
 126            KRB5_CFLAGS="-I/usr/include/heimdal"
 127            KRB5_CPPFLAGS="-I/usr/include/heimdal"
 128 -          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
 129 +          KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib"
 130            AC_MSG_RESULT(yes)
 131        else
 132            KRB5_CFLAGS="-I/usr/include/heimdal"
 133 @@ -6175,7 +6175,7 @@
 134
 135  fi
 136
 137 -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 138 +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
 139  LIB_REMOVE_USR_LIB(LDFLAGS)
 140  LIB_REMOVE_USR_LIB(LIBS)
 141  LIB_REMOVE_USR_LIB(KRB5_LIBS)