samba-lib64.patch

   1 diff -urN samba-3.0.4.org/source/aclocal.m4 samba-3.0.4/source/aclocal.m4
   2 --- samba-3.0.4.org/source/aclocal.m4   2004-05-13 02:29:15.224209664 +0200
   3 +++ samba-3.0.4/source/aclocal.m4       2004-05-13 02:29:22.478106904 +0200
   4 @@ -541,12 +541,12 @@
   5    $1=[$]ac_new_flags
   6  ])
   7
   8 -dnl Removes -L/usr/lib/? from given variable
   9 +dnl Removes -L/usr/lib64/? from given variable
  10  AC_DEFUN(LIB_REMOVE_USR_LIB,[
  11    ac_new_flags=""
  12    for i in [$]$1; do
  13      case [$]i in
  14 -    -L/usr/lib|-L/usr/lib/) ;;
  15 +    -L/usr/lib64|-L/usr/lib64/) ;;
  16      *) ac_new_flags="[$]ac_new_flags [$]i" ;;
  17      esac
  18    done
  19 @@ -677,9 +677,9 @@
  20  ])
  21
  22  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
  23 -dnl This function doesn't add -L/usr/lib into LDFLAGS
  24 +dnl This function doesn't add -L/usr/lib64 into LDFLAGS
  25  AC_DEFUN(LIB_ADD_DIR,[
  26 -if test "$2" != "/usr/lib" ; then
  27 +if test "$2" != "/usr/lib64" ; then
  28      $1="$$1 -L$2"
  29  fi
  30  ])
  31 diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
  32 --- samba-3.0.4.org/source/configure.in 2004-05-13 02:29:15.234208144 +0200
  33 +++ samba-3.0.4/source/configure.in     2004-05-13 02:32:02.287812136 +0200
  34 @@ -19,7 +19,7 @@
  35  mandir="\${prefix}/man"
  36  logfilebase="\${VARDIR}"
  37  privatedir="\${prefix}/private"
  38 -libdir="\${prefix}/lib"
  39 +libdir="\${prefix}/lib64"
  40  configdir="\${LIBDIR}"
  41  swatdir="\${prefix}/swat"
  42
  43 @@ -27,12 +27,12 @@
  44  [  --with-fhs              Use FHS-compliant paths (default=no)],
  45  [ case "$withval" in
  46    yes)
  47 -    lockdir="\${VARDIR}/lib/samba"
  48 +    lockdir="\${VARDIR}/lib64/samba"
  49      piddir="\${VARDIR}/run"
  50      mandir="\${prefix}/share/man"
  51      logfilebase="\${VARDIR}/log/samba"
  52      privatedir="\${CONFIGDIR}/private"
  53 -    libdir="\${prefix}/lib/samba"
  54 +    libdir="\${prefix}/lib64/samba"
  55      configdir="${sysconfdir}/samba"
  56      swatdir="\${DATADIR}/samba/swat"
  57      ;;
  58 @@ -587,7 +587,7 @@
  59  # Note: iconv does that explicitly below, but other packages
  60  # don't.
  61         CPPFLAGS="$CPPFLAGS -I/sw/include"
  62 -       LDFLAGS="$LDFLAGS -L/sw/lib"
  63 +       LDFLAGS="$LDFLAGS -L/sw/lib64"
  64
  65  # If we have dlsym_prepend_underscore (from Fink's dlcompat),
  66  # use that instead of plain dlsym.
  67 @@ -868,7 +868,7 @@
  68      _cppflags=${CPPFLAGS}
  69
  70      # Add additional search path
  71 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
  72 +    LDFLAGS="-L$with_readline/lib64 $LDFLAGS"
  73      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  74
  75      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
  76 @@ -879,7 +879,7 @@
  77         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
  78        done
  79        AC_CHECK_LIB(readline, rl_callback_handler_install,
  80 -       [TERMLDFLAGS="-L$with_readline/lib"
  81 +       [TERMLDFLAGS="-L$with_readline/lib64"
  82         TERMCPPFLAGS="-I$with_readline/include"
  83         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  84         TERMLIBS="-lreadline $TERMLIBS"
  85 @@ -1658,7 +1658,7 @@
  86  ICONV_LOCATION=standard
  87  LOOK_DIRS="/usr /usr/local /sw /opt"
  88  AC_ARG_WITH(libiconv,
  89 -[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
  90 +[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
  91  [
  92    if test "$withval" = "no" ; then
  93      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
  94 @@ -1708,7 +1708,7 @@
  95          # check for iconv in libc
  96          ic_save_LIBS="$LIBS"
  97          if test x"$ICONV_PATH_SPEC" = "xyes" ; then
  98 -           LIBS="$LIBS -L$ICONV_LOCATION/lib"
  99 +           LIBS="$LIBS -L$ICONV_LOCATION/lib64"
 100          fi
 101          if test x"$jm_cv_lib_iconv" != x; then
 102             LIBS="$LIBS -l$jm_cv_lib_iconv"
 103 @@ -2568,7 +2568,7 @@
 104          AC_MSG_RESULT($withval)
 105          KRB5_CFLAGS="-I$withval/include"
 106          KRB5_CPPFLAGS="-I$withval/include"
 107 -        KRB5_LDFLAGS="-L$withval/lib"
 108 +        KRB5_LDFLAGS="-L$withval/lib64"
 109          FOUND_KRB5=yes
 110          ;;
 111        esac ],
 112 @@ -2581,10 +2581,10 @@
 113      # see if this box has the SuSE location for the heimdal krb implementation
 114      AC_MSG_CHECKING(for /usr/include/heimdal)
 115      if test -d /usr/include/heimdal; then
 116 -      if test -f /usr/lib/heimdal/lib/libkrb5.a; then
 117 +      if test -f /usr/lib64/heimdal/lib/libkrb5.a; then
 118            KRB5_CFLAGS="-I/usr/include/heimdal"
 119            KRB5_CPPFLAGS="-I/usr/include/heimdal"
 120 -          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
 121 +          KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib"
 122            AC_MSG_RESULT(yes)
 123        else
 124            KRB5_CFLAGS="-I/usr/include/heimdal"
 125 @@ -4372,7 +4372,7 @@
 126  builddir=`pwd`
 127  AC_SUBST(builddir)
 128
 129 -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 130 +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
 131  LIB_REMOVE_USR_LIB(LDFLAGS)
 132  LIB_REMOVE_USR_LIB(LIBS)
 133
 134 diff -urN samba-3.0.4.org/source/Makefile.in samba-3.0.4/source/Makefile.in
 135 --- samba-3.0.4.org/source/Makefile.in  2004-05-13 02:29:15.223209816 +0200
 136 +++ samba-3.0.4/source/Makefile.in      2004-05-13 02:29:22.474107512 +0200
 137 @@ -1278,9 +1278,9 @@
 138         @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
 139
 140  installclientlib: installdirs libsmbclient
 141 -       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
 142 -       -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
 143 -       -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
 144 +       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib64
 145 +       -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib64
 146 +       -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib64
 147         @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
 148         -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
 149
 150 diff -urN samba-3.0.4.org/source/torture/nsstest.c samba-3.0.4/source/torture/nsstest.c
 151 --- samba-3.0.4.org/source/torture/nsstest.c    2004-05-13 02:29:15.062234288 +0200
 152 +++ samba-3.0.4/source/torture/nsstest.c        2004-05-13 02:29:22.503103104 +0200
 153 @@ -21,7 +21,7 @@
 154
 155  #include "includes.h"
 156
 157 -static const char *so_path = "/lib/libnss_winbind.so";
 158 +static const char *so_path = "/lib64/libnss_winbind.so";
 159  static const char *nss_name = "winbind";
 160  static int nss_errno;
 161  static NSS_STATUS last_error;