samba-lib64.patch

   1 diff -durN samba-3.0.1.orig/source/Makefile.in samba-3.0.1/source/Makefile.in
   2 --- samba-3.0.1.orig/source/Makefile.in 2003-12-10 22:59:18.000000000 +0100
   3 +++ samba-3.0.1/source/Makefile.in      2004-12-30 13:53:05.263072472 +0100
   4 @@ -1243,9 +1243,9 @@
   5         @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
   6
   7  installclientlib: installdirs libsmbclient
   8 -       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
   9 -       -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
  10 -       -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
  11 +       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib64
  12 +       -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib64
  13 +       -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib64
  14         @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
  15         -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
  16
  17 diff -durN samba-3.0.1.orig/source/aclocal.m4 samba-3.0.1/source/aclocal.m4
  18 --- samba-3.0.1.orig/source/aclocal.m4  2003-11-07 18:37:32.000000000 +0100
  19 +++ samba-3.0.1/source/aclocal.m4       2004-12-30 13:54:05.767874344 +0100
  20 @@ -496,12 +496,12 @@
  21    $1=[$]ac_new_flags
  22  ])
  23
  24 -dnl Removes -L/usr/lib/? from given variable
  25 +dnl Removes -L/usr/lib64/? from given variable
  26  AC_DEFUN(LIB_REMOVE_USR_LIB,[
  27    ac_new_flags=""
  28    for i in [$]$1; do
  29      case [$]i in
  30 -    -L/usr/lib|-L/usr/lib/) ;;
  31 +    -L/usr/lib64|-L/usr/lib64/) ;;
  32      *) ac_new_flags="[$]ac_new_flags [$]i" ;;
  33      esac
  34    done
  35 @@ -632,9 +632,9 @@
  36  ])
  37
  38  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
  39 -dnl This function doesn't add -L/usr/lib into LDFLAGS
  40 +dnl This function doesn't add -L/usr/lib64 into LDFLAGS
  41  AC_DEFUN(LIB_ADD_DIR,[
  42 -if test "$2" != "/usr/lib" ; then
  43 +if test "$2" != "/usr/lib64" ; then
  44      $1="$$1 -L$2"
  45  fi
  46  ])
  47 diff -durN samba-3.0.1.orig/source/configure.in samba-3.0.1/source/configure.in
  48 --- samba-3.0.1.orig/source/configure.in        2003-12-15 04:36:25.000000000 +0100
  49 +++ samba-3.0.1/source/configure.in     2004-12-30 13:56:21.871183496 +0100
  50 @@ -22,7 +22,7 @@
  51      mandir="\${prefix}/share/man"
  52      logfilebase="\${VARDIR}/log/samba"
  53      privatedir="\${CONFIGDIR}/private"
  54 -    libdir="\${prefix}/lib/samba"
  55 +    libdir="\${prefix}/lib64/samba"
  56      swatdir="\${DATADIR}/samba/swat",
  57      configdir="\${LIBDIR}"
  58      logfilebase="\${VARDIR}"
  59 @@ -825,7 +825,7 @@
  60      _cppflags=${CPPFLAGS}
  61
  62      # Add additional search path
  63 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
  64 +    LDFLAGS="-L$with_readline/lib64 $LDFLAGS"
  65      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  66
  67      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
  68 @@ -836,7 +836,7 @@
  69         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
  70        done
  71        AC_CHECK_LIB(readline, rl_callback_handler_install,
  72 -       [TERMLDFLAGS="-L$with_readline/lib"
  73 +       [TERMLDFLAGS="-L$with_readline/lib64"
  74         TERMCPPFLAGS="-I$with_readline/include"
  75         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  76         TERMLIBS="-lreadline $TERMLIBS"
  77 @@ -1615,7 +1615,7 @@
  78  ICONV_LOCATION=standard
  79  LOOK_DIRS="/usr /usr/local /sw"
  80  AC_ARG_WITH(libiconv,
  81 -[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
  82 +[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
  83  [
  84    if test "$withval" = "no" ; then
  85      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
  86 @@ -1635,7 +1635,7 @@
  87      CPPFLAGS="$CPPFLAGS -I$i/include"
  88  dnl This is here to handle -withval stuff for --with-libiconv
  89  dnl Perhaps we should always add a -L
  90 -    LDFLAGS="$LDFLAGS -L$i/lib"
  91 +    LDFLAGS="$LDFLAGS -L$i/lib64"
  92      LIBS=
  93      export LDFLAGS LIBS CPPFLAGS
  94  dnl Try to find iconv(3)
  95 @@ -1643,7 +1643,7 @@
  96
  97      if test "$ICONV_FOUND" = yes; then
  98         LDFLAGS=$save_LDFLAG
  99 -        LIB_ADD_DIR(LDFLAGS, "$i/lib")
 100 +        LIB_ADD_DIR(LDFLAGS, "$i/lib64")
 101          CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
 102          LIBS="$save_LIBS"
 103          ICONV_LOCATION=$i
 104 @@ -1655,7 +1655,7 @@
 105          # check for iconv in libc
 106          ic_save_LIBS="$LIBS"
 107          if test x"$ICONV_PATH_SPEC" = "xyes" ; then
 108 -           LIBS="$LIBS -L$ICONV_LOCATION/lib"
 109 +           LIBS="$LIBS -L$ICONV_LOCATION/lib64"
 110          fi
 111          if test x"$jm_cv_lib_iconv" != x; then
 112             LIBS="$LIBS -l$jm_cv_lib_iconv"
 113 @@ -1719,7 +1719,7 @@
 114             fi
 115            dnl Add the flags we need to CPPFLAGS and LDFLAGS
 116            CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
 117 -          LIB_ADD_DIR(LDFLAGS, "$i/lib")
 118 +          LIB_ADD_DIR(LDFLAGS, "$i/lib64")
 119            export CPPFLAGS
 120             AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
 121            AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,$default_dos_charset,[Default dos charset name])
 122 @@ -2468,7 +2468,7 @@
 123          AC_MSG_RESULT($withval)
 124          KRB5_CFLAGS="-I$withval/include"
 125          KRB5_CPPFLAGS="-I$withval/include"
 126 -        KRB5_LDFLAGS="-L$withval/lib"
 127 +        KRB5_LDFLAGS="-L$withval/lib64"
 128          FOUND_KRB5=yes
 129          ;;
 130        esac ],
 131 @@ -2481,10 +2481,10 @@
 132      # see if this box has the SuSE location for the heimdal krb implementation
 133      AC_MSG_CHECKING(for /usr/include/heimdal)
 134      if test -d /usr/include/heimdal; then
 135 -      if test -f /usr/lib/heimdal/lib/libkrb5.a; then
 136 +      if test -f /usr/lib64/heimdal/lib/libkrb5.a; then
 137            KRB5_CFLAGS="-I/usr/include/heimdal"
 138            KRB5_CPPFLAGS="-I/usr/include/heimdal"
 139 -          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
 140 +          KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib"
 141            AC_MSG_RESULT(yes)
 142        else
 143            KRB5_CFLAGS="-I/usr/include/heimdal"
 144 @@ -4261,7 +4261,7 @@
 145  builddir=`pwd`
 146  AC_SUBST(builddir)
 147
 148 -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 149 +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
 150  LIB_REMOVE_USR_LIB(LDFLAGS)
 151  LIB_REMOVE_USR_LIB(LIBS)
 152
 153 diff -durN samba-3.0.1.orig/source/torture/nsstest.c samba-3.0.1/source/torture/nsstest.c
 154 --- samba-3.0.1.orig/source/torture/nsstest.c   2003-08-15 22:40:00.000000000 +0200
 155 +++ samba-3.0.1/source/torture/nsstest.c        2004-12-30 13:57:10.644768784 +0100
 156 @@ -21,7 +21,7 @@
 157
 158  #include "includes.h"
 159
 160 -static const char *so_path = "/lib/libnss_winbind.so";
 161 +static const char *so_path = "/lib64/libnss_winbind.so";
 162  static const char *nss_name = "winbind";
 163  static int nss_errno;
 164  static NSS_STATUS last_error;