-diff -durN samba-3.0.1.orig/source/Makefile.in samba-3.0.1/source/Makefile.in
---- samba-3.0.1.orig/source/Makefile.in 2003-12-10 22:59:18.000000000 +0100
-+++ samba-3.0.1/source/Makefile.in 2004-12-30 13:53:05.263072472 +0100
-@@ -1243,9 +1243,9 @@
- @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
+--- samba-3.0.23b.org/source/torture/nsstest.c 2006-04-20 04:29:44.000000000 +0200
++++ samba-3.0.23b/source/torture/nsstest.c 2006-08-09 21:19:38.922291250 +0200
+@@ -21,7 +21,7 @@
- installclientlib: installdirs libsmbclient
-- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
-- -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
-- -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
-+ @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib64
-+ -$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib64
-+ -$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib64
- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- -$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
+ #include "includes.h"
-diff -durN samba-3.0.1.orig/source/aclocal.m4 samba-3.0.1/source/aclocal.m4
---- samba-3.0.1.orig/source/aclocal.m4 2003-11-07 18:37:32.000000000 +0100
-+++ samba-3.0.1/source/aclocal.m4 2004-12-30 13:54:05.767874344 +0100
-@@ -496,12 +496,12 @@
+-static const char *so_path = "/lib/libnss_winbind.so";
++static const char *so_path = "/lib64/libnss_winbind.so";
+ static const char *nss_name = "winbind";
+ static int nss_errno;
+ static NSS_STATUS last_error;
+--- samba-3.0.25a/source/aclocal.m4.orig 2007-03-01 05:55:17.000000000 +0100
++++ samba-3.0.25a/source/aclocal.m4 2007-06-14 18:45:50.703496205 +0200
+@@ -268,20 +268,20 @@
$1=[$]ac_new_flags
])
-
--dnl Removes -L/usr/lib/? from given variable
-+dnl Removes -L/usr/lib64/? from given variable
+
+-dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
+-dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
++dnl Removes '-L/usr/lib64[/]', '-Wl,-rpath,/usr/lib64[/]'
++dnl and '-Wl,-rpath -Wl,/usr/lib64[/]' from given variable
AC_DEFUN(LIB_REMOVE_USR_LIB,[
ac_new_flags=""
+ l=""
for i in [$]$1; do
- case [$]i in
-- -L/usr/lib|-L/usr/lib/) ;;
-+ -L/usr/lib64|-L/usr/lib64/) ;;
- *) ac_new_flags="[$]ac_new_flags [$]i" ;;
- esac
- done
-@@ -632,9 +632,9 @@
+ case [$]l[$]i in
+- -L/usr/lib) ;;
+- -L/usr/lib/) ;;
+- -Wl,-rpath,/usr/lib) ;;
+- -Wl,-rpath,/usr/lib/) ;;
++ -L/usr/lib64) ;;
++ -L/usr/lib64/) ;;
++ -Wl,-rpath,/usr/lib64) ;;
++ -Wl,-rpath,/usr/lib64/) ;;
+ -Wl,-rpath) l=[$]i;;
+- -Wl,-rpath-Wl,/usr/lib) l="";;
+- -Wl,-rpath-Wl,/usr/lib/) l="";;
++ -Wl,-rpath-Wl,/usr/lib64) l="";;
++ -Wl,-rpath-Wl,/usr/lib64/) l="";;
+ *)
+ s=" "
+ if test x"[$]ac_new_flags" = x""; then
+@@ -429,9 +429,9 @@
])
dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
$1="$$1 -L$2"
fi
])
-diff -durN samba-3.0.1.orig/source/configure.in samba-3.0.1/source/configure.in
---- samba-3.0.1.orig/source/configure.in 2003-12-15 04:36:25.000000000 +0100
-+++ samba-3.0.1/source/configure.in 2004-12-30 13:56:21.871183496 +0100
-@@ -22,7 +22,7 @@
+--- samba-3.0.25a/source/configure.in.orig 2007-05-23 17:29:20.000000000 +0200
++++ samba-3.0.25a/source/configure.in 2007-06-14 18:49:28.307646759 +0200
+@@ -31,7 +31,7 @@
+ test "${mandir}" || mandir="\${prefix}/man"
+ logfilebase="\${VARDIR}"
+ privatedir="\${prefix}/private"
+-test "${libdir}" || libdir="\${prefix}/lib"
++test "${libdir}" || libdir="\${prefix}/lib64"
+ pammodulesdir="\${LIBDIR}/security"
+ configdir="\${LIBDIR}"
+ swatdir="\${prefix}/swat"
+@@ -45,7 +35,7 @@
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
privatedir="\${CONFIGDIR}/private"
- libdir="\${prefix}/lib/samba"
+ libdir="\${prefix}/lib64/samba"
- swatdir="\${DATADIR}/samba/swat",
- configdir="\${LIBDIR}"
- logfilebase="\${VARDIR}"
-@@ -825,7 +825,7 @@
+ configdir="\${sysconfdir}/samba"
+ swatdir="\${DATADIR}/samba/swat"
+ ;;
+@@ -1132,7 +1132,7 @@
_cppflags=${CPPFLAGS}
# Add additional search path
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-@@ -836,7 +836,7 @@
+@@ -1143,7 +1143,7 @@
AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
done
AC_CHECK_LIB(readline, rl_callback_handler_install,
TERMCPPFLAGS="-I$with_readline/include"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
TERMLIBS="-lreadline $TERMLIBS"
-@@ -1615,7 +1615,7 @@
+@@ -2337,7 +2337,7 @@
ICONV_LOCATION=standard
- LOOK_DIRS="/usr /usr/local /sw"
+ LOOK_DIRS="/usr /usr/local /sw /opt"
AC_ARG_WITH(libiconv,
-[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
+[ --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib64 and BASEDIR/include (default=auto) ],
[
if test "$withval" = "no" ; then
AC_MSG_ERROR([argument to --with-libiconv must be a directory])
-@@ -1635,7 +1635,7 @@
- CPPFLAGS="$CPPFLAGS -I$i/include"
- dnl This is here to handle -withval stuff for --with-libiconv
- dnl Perhaps we should always add a -L
-- LDFLAGS="$LDFLAGS -L$i/lib"
-+ LDFLAGS="$LDFLAGS -L$i/lib64"
- LIBS=
- export LDFLAGS LIBS CPPFLAGS
- dnl Try to find iconv(3)
-@@ -1643,7 +1643,7 @@
-
- if test "$ICONV_FOUND" = yes; then
- LDFLAGS=$save_LDFLAG
-- LIB_ADD_DIR(LDFLAGS, "$i/lib")
-+ LIB_ADD_DIR(LDFLAGS, "$i/lib64")
- CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
- LIBS="$save_LIBS"
- ICONV_LOCATION=$i
-@@ -1655,7 +1655,7 @@
- # check for iconv in libc
- ic_save_LIBS="$LIBS"
- if test x"$ICONV_PATH_SPEC" = "xyes" ; then
-- LIBS="$LIBS -L$ICONV_LOCATION/lib"
-+ LIBS="$LIBS -L$ICONV_LOCATION/lib64"
- fi
- if test x"$jm_cv_lib_iconv" != x; then
- LIBS="$LIBS -l$jm_cv_lib_iconv"
-@@ -1719,7 +1719,7 @@
- fi
- dnl Add the flags we need to CPPFLAGS and LDFLAGS
- CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
-- LIB_ADD_DIR(LDFLAGS, "$i/lib")
-+ LIB_ADD_DIR(LDFLAGS, "$i/lib64")
- export CPPFLAGS
- AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
- AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,$default_dos_charset,[Default dos charset name])
-@@ -2468,7 +2468,7 @@
+@@ -2366,7 +2366,7 @@
+ dnl library directory is there and check the ABI directory first (which
+ dnl should be harmless on other systems.
+ dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
+- for l in "lib32" "lib" "lib/hpux32"; do
++ for l in "lib32" "lib64" "lib/hpux32"; do
+ if test -d "$i/$l" ; then
+ LDFLAGS="$save_LDFLAGS -L$i/$l"
+ LIBS=
+@@ -3370,7 +3370,7 @@
AC_MSG_RESULT($withval)
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
- KRB5_LDFLAGS="-L$withval/lib"
+ KRB5_LDFLAGS="-L$withval/lib64"
FOUND_KRB5=yes
- ;;
- esac ],
-@@ -2481,10 +2481,10 @@
+ if test -x "$withval/bin/krb5-config"; then
+ KRB5CONFIG=$withval/bin/krb5-config
+@@ -3407,10 +3407,10 @@
# see if this box has the SuSE location for the heimdal krb implementation
AC_MSG_CHECKING(for /usr/include/heimdal)
if test -d /usr/include/heimdal; then
AC_MSG_RESULT(yes)
else
KRB5_CFLAGS="-I/usr/include/heimdal"
-@@ -4261,7 +4261,7 @@
- builddir=`pwd`
- AC_SUBST(builddir)
+@@ -6175,7 +6175,7 @@
+
+ fi
-dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
+dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
LIB_REMOVE_USR_LIB(LDFLAGS)
LIB_REMOVE_USR_LIB(LIBS)
-
-diff -durN samba-3.0.1.orig/source/torture/nsstest.c samba-3.0.1/source/torture/nsstest.c
---- samba-3.0.1.orig/source/torture/nsstest.c 2003-08-15 22:40:00.000000000 +0200
-+++ samba-3.0.1/source/torture/nsstest.c 2004-12-30 13:57:10.644768784 +0100
-@@ -21,7 +21,7 @@
-
- #include "includes.h"
-
--static const char *so_path = "/lib/libnss_winbind.so";
-+static const char *so_path = "/lib64/libnss_winbind.so";
- static const char *nss_name = "winbind";
- static int nss_errno;
- static NSS_STATUS last_error;
+ LIB_REMOVE_USR_LIB(KRB5_LIBS)
projects / packages / samba.git / blobdiff