samba-lib64.patch

   1 diff -Nur samba-3.0.11/source/aclocal.m4 samba-3.0.11.64/source/aclocal.m4
   2 --- samba-3.0.11/source/aclocal.m4      2004-10-25 23:05:11.000000000 +0200
   3 +++ samba-3.0.11.64/source/aclocal.m4   2005-02-05 11:16:37.674724456 +0100
   4 @@ -511,7 +511,7 @@
   5    fi
   6
   7    AC_REQUIRE([AC_CANONICAL_TARGET])
   8 -  AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib/postgresql/bin])
   9 +  AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib64/postgresql/bin])
  10    AC_MSG_CHECKING(for PGSQL)
  11    no_pgsql=""
  12    if test "$PGSQL_CONFIG" = "no" ; then
  13 @@ -541,12 +541,12 @@
  14    $1=[$]ac_new_flags
  15  ])
  16
  17 -dnl Removes -L/usr/lib/? from given variable
  18 +dnl Removes -L/usr/lib64/? from given variable
  19  AC_DEFUN(LIB_REMOVE_USR_LIB,[
  20    ac_new_flags=""
  21    for i in [$]$1; do
  22      case [$]i in
  23 -    -L/usr/lib|-L/usr/lib/) ;;
  24 +    -L/usr/lib64|-L/usr/lib64/) ;;
  25      *) ac_new_flags="[$]ac_new_flags [$]i" ;;
  26      esac
  27    done
  28 @@ -677,9 +677,9 @@
  29  ])
  30
  31  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
  32 -dnl This function doesn't add -L/usr/lib into LDFLAGS
  33 +dnl This function doesn't add -L/usr/lib64 into LDFLAGS
  34  AC_DEFUN(LIB_ADD_DIR,[
  35 -if test "$2" != "/usr/lib" ; then
  36 +if test "$2" != "/usr/lib64" ; then
  37      $1="$$1 -L$2"
  38  fi
  39  ])
  40 diff -Nur samba-3.0.11/source/configure.in samba-3.0.11.64/source/configure.in
  41 --- samba-3.0.11/source/configure.in    2005-02-05 11:20:30.587316360 +0100
  42 +++ samba-3.0.11.64/source/configure.in 2005-02-05 11:16:37.708719288 +0100
  43 @@ -27,7 +27,7 @@
  44  mandir="\${prefix}/man"
  45  logfilebase="\${VARDIR}"
  46  privatedir="\${prefix}/private"
  47 -libdir="\${prefix}/lib"
  48 +libdir="\${prefix}/lib64"
  49  configdir="\${LIBDIR}"
  50  swatdir="\${prefix}/swat"
  51
  52 @@ -40,7 +40,7 @@
  53      mandir="\${prefix}/share/man"
  54      logfilebase="\${VARDIR}/log/samba"
  55      privatedir="\${CONFIGDIR}/private"
  56 -    libdir="\${prefix}/lib/samba"
  57 +    libdir="\${prefix}/lib64/samba"
  58      configdir="${sysconfdir}/samba"
  59      swatdir="\${DATADIR}/samba/swat"
  60      ;;
  61 @@ -629,7 +629,7 @@
  62  # Note: iconv does that explicitly below, but other packages
  63  # don't.
  64         CPPFLAGS="$CPPFLAGS -I/sw/include"
  65 -       LDFLAGS="$LDFLAGS -L/sw/lib"
  66 +       LDFLAGS="$LDFLAGS -L/sw/lib64"
  67
  68  # If we have dlsym_prepend_underscore (from Fink's dlcompat),
  69  # use that instead of plain dlsym.
  70 @@ -914,7 +914,7 @@
  71      _cppflags=${CPPFLAGS}
  72
  73      # Add additional search path
  74 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
  75 +    LDFLAGS="-L$with_readline/lib64 $LDFLAGS"
  76      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  77
  78      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
  79 @@ -925,7 +925,7 @@
  80         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
  81        done
  82        AC_CHECK_LIB(readline, rl_callback_handler_install,
  83 -       [TERMLDFLAGS="-L$with_readline/lib"
  84 +       [TERMLDFLAGS="-L$with_readline/lib64"
  85         TERMCPPFLAGS="-I$with_readline/include"
  86         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  87         TERMLIBS="-lreadline $TERMLIBS"
  88 @@ -1725,7 +1725,7 @@
  89  ICONV_LOCATION=standard
  90  LOOK_DIRS="/usr /usr/local /sw /opt"
  91  AC_ARG_WITH(libiconv,
  92 -[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
  93 +[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
  94  [
  95    if test "$withval" = "no" ; then
  96      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
  97 @@ -2652,7 +2652,7 @@
  98          AC_MSG_RESULT($withval)
  99          KRB5_CFLAGS="-I$withval/include"
 100          KRB5_CPPFLAGS="-I$withval/include"
 101 -        KRB5_LDFLAGS="-L$withval/lib"
 102 +        KRB5_LDFLAGS="-L$withval/lib64"
 103          FOUND_KRB5=yes
 104         if test -x "$withval/bin/krb5-config"; then
 105                 KRB5CONFIG=$withval/bin/krb5-config
 106 @@ -2689,10 +2689,10 @@
 107      # see if this box has the SuSE location for the heimdal krb implementation
 108      AC_MSG_CHECKING(for /usr/include/heimdal)
 109      if test -d /usr/include/heimdal; then
 110 -      if test -f /usr/lib/heimdal/lib/libkrb5.a; then
 111 +      if test -f /usr/lib64/heimdal/lib/libkrb5.a; then
 112            KRB5_CFLAGS="-I/usr/include/heimdal"
 113            KRB5_CPPFLAGS="-I/usr/include/heimdal"
 114 -          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
 115 +          KRB5_LDFLAGS="-L/usr/lib64/heimdal/lib"
 116            AC_MSG_RESULT(yes)
 117        else
 118            KRB5_CFLAGS="-I/usr/include/heimdal"
 119 @@ -4612,7 +4612,7 @@
 120  builddir=`pwd`
 121  AC_SUBST(builddir)
 122
 123 -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 124 +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
 125  LIB_REMOVE_USR_LIB(LDFLAGS)
 126  LIB_REMOVE_USR_LIB(LIBS)
 127
 128 diff -Nur samba-3.0.11/source/torture/nsstest.c samba-3.0.11.64/source/torture/nsstest.c
 129 --- samba-3.0.11/source/torture/nsstest.c       2004-10-25 23:05:10.000000000 +0200
 130 +++ samba-3.0.11.64/source/torture/nsstest.c    2005-02-05 11:16:37.690722024 +0100
 131 @@ -21,7 +21,7 @@
 132
 133  #include "includes.h"
 134
 135 -static const char *so_path = "/lib/libnss_winbind.so";
 136 +static const char *so_path = "/lib64/libnss_winbind.so";
 137  static const char *nss_name = "winbind";
 138  static int nss_errno;
 139  static NSS_STATUS last_error;