- added try-restart

[packages/samba.git] / samba-lib64.patch

diff --git a/samba-lib64.patch b/samba-lib64.patch
index f19667a8faaf9b97bac695fd4a2b95202763041f..d8a398528c52972f4ac19bd8451e692e8d74513d 100644 (file)
--- a/samba-lib64.patch
+++ b/samba-lib64.patch
@@ -63,13 +63,7 @@
  pammodulesdir="\${LIBDIR}/security"
  configdir="\${LIBDIR}"
  swatdir="\${prefix}/swat"
-@@ -40,12 +40,12 @@
- [  --with-fhs              Use FHS-compliant paths (default=no)],
- [ case "$withval" in
-   yes)
--    lockdir="\${VARDIR}/lib/samba"
-+    lockdir="\${VARDIR}/lib64/samba"
-     piddir="\${VARDIR}/run"
+@@ -45,7 +35,7 @@
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
@@ -78,17 +72,6 @@
      configdir="\${sysconfdir}/samba"
      swatdir="\${DATADIR}/samba/swat"
      ;;
-@@ -231,8 +231,8 @@
- ])
- 
- SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
--SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
--SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/talloc"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 @@ -1132,7 +1132,7 @@
      _cppflags=${CPPFLAGS}
  
@@ -116,6 +99,15 @@
  [
    if test "$withval" = "no" ; then
      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
+@@ -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"