samba-lib64.patch

   1 diff -Nur samba-3.0.7.orig/source/aclocal.m4 samba-3.0.7/source/aclocal.m4
   2 --- samba-3.0.7.orig/source/aclocal.m4  2004-04-04 09:37:42.000000000 +0200
   3 +++ samba-3.0.7/source/aclocal.m4       2004-09-14 10:59:27.493878552 +0200
   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.7.orig/source/configure.in samba-3.0.7/source/configure.in
  41 --- samba-3.0.7.orig/source/configure.in        2004-09-12 05:47:18.000000000 +0200
  42 +++ samba-3.0.7/source/configure.in     2004-09-14 10:59:27.501877336 +0200
  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 @@ -35,12 +35,12 @@
  53  [  --with-fhs              Use FHS-compliant paths (default=no)],
  54  [ case "$withval" in
  55    yes)
  56 -    lockdir="\${VARDIR}/lib/samba"
  57 +    lockdir="\${VARDIR}/lib64/samba"
  58      piddir="\${VARDIR}/run"
  59      mandir="\${prefix}/share/man"
  60      logfilebase="\${VARDIR}/log/samba"
  61      privatedir="\${CONFIGDIR}/private"
  62 -    libdir="\${prefix}/lib/samba"
  63 +    libdir="\${prefix}/lib64/samba"
  64      configdir="${sysconfdir}/samba"
  65      swatdir="\${DATADIR}/samba/swat"
  66      ;;
  67 @@ -595,7 +595,7 @@
  68  # Note: iconv does that explicitly below, but other packages
  69  # don't.
  70         CPPFLAGS="$CPPFLAGS -I/sw/include"
  71 -       LDFLAGS="$LDFLAGS -L/sw/lib"
  72 +       LDFLAGS="$LDFLAGS -L/sw/lib64"
  73
  74  # If we have dlsym_prepend_underscore (from Fink's dlcompat),
  75  # use that instead of plain dlsym.
  76 @@ -878,7 +878,7 @@
  77      _cppflags=${CPPFLAGS}
  78
  79      # Add additional search path
  80 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
  81 +    LDFLAGS="-L$with_readline/lib64 $LDFLAGS"
  82      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  83
  84      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
  85 @@ -889,7 +889,7 @@
  86         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
  87        done
  88        AC_CHECK_LIB(readline, rl_callback_handler_install,
  89 -       [TERMLDFLAGS="-L$with_readline/lib"
  90 +       [TERMLDFLAGS="-L$with_readline/lib64"
  91         TERMCPPFLAGS="-I$with_readline/include"
  92         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  93         TERMLIBS="-lreadline $TERMLIBS"
  94 @@ -1683,7 +1683,7 @@
  95  ICONV_LOCATION=standard
  96  LOOK_DIRS="/usr /usr/local /sw /opt"
  97  AC_ARG_WITH(libiconv,
  98 -[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
  99 +[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
 100  [
 101    if test "$withval" = "no" ; then
 102      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
 103 @@ -2630,7 +2630,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 @@ -2643,10 +2643,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 @@ -4491,7 +4491,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 -Nur samba-3.0.7.orig/source/torture/nsstest.c samba-3.0.7/source/torture/nsstest.c
 135 --- samba-3.0.7.orig/source/torture/nsstest.c   2004-04-04 09:37:39.000000000 +0200
 136 +++ samba-3.0.7/source/torture/nsstest.c        2004-09-14 10:59:27.503877032 +0200
 137 @@ -21,7 +21,7 @@
 138
 139  #include "includes.h"
 140
 141 -static const char *so_path = "/lib/libnss_winbind.so";
 142 +static const char *so_path = "/lib64/libnss_winbind.so";
 143  static const char *nss_name = "winbind";
 144  static int nss_errno;
 145  static NSS_STATUS last_error;