svn commit: samba r8949 - branches/SAMBA_3_0/source trunk/source

[tpot at samba.org]

Author: tpot
Date: 2005-08-02 20:58:10 +0000 (Tue, 02 Aug 2005)
New Revision: 8949

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8949

Log:
Fix incorrect SHLIBEXT is set when running configure script on HPUX IA 
systems. This causes share libs to be built with .sl instead of .so 
extensions.  Patch from Adrian Tam to fix bugzilla #2733.

Modified:
   branches/SAMBA_3_0/source/configure.in
   trunk/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2005-08-02 20:50:16 UTC (rev 8948)
+++ branches/SAMBA_3_0/source/configure.in	2005-08-02 20:58:10 UTC (rev 8949)
@@ -1404,7 +1404,6 @@
 			AC_DEFINE(BROKEN_STRNDUP,1,[Does strndup work correctly])
 			;;
 		*hpux*) AC_DEFINE(HPUX,1,[Whether the host os is HPUX])
-			SHLIBEXT="sl"
 			# Use special PIC flags for the native HP-UX compiler.
 			if test $ac_cv_prog_cc_Ae = yes; then
 				BLDSHARED="true"
@@ -1415,7 +1414,13 @@
 			elif test "${GCC}" = "yes"; then
 				PICFLAGS="-fPIC"
 			fi
-			DYNEXP="-Wl,-E"
+			if test "$host_cpu" = "ia64"; then
+				SHLIBEXT="so"
+				DYNEXP="-Wl,-E,+b /usr/local/lib/hpux32:/usr/lib/hpux32"
+			else
+				SHLIBEXT="sl"
+				DYNEXP="-Wl,-E,+b /usr/local/lib:/usr/lib"
+			fi
 			AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
 			AC_DEFINE(POSIX_ACL_NEEDS_MASK,1,[Does a POSIX ACL need a mask element])
 			;;
@@ -1905,7 +1910,8 @@
 dnl succeed when the header is found. To counter this, make sure the 
 dnl library directory is there and check the ABI directory first (which
 dnl should be harmless on other systems.
-    for l in "lib32" "lib" ; do
+dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
+    for l in "lib32" "lib" "lib/hpux32"; do
         if test -d "$i/$l" ; then
                 LDFLAGS="$save_LDFLAGS -L$i/$l"
                 LIBS=

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2005-08-02 20:50:16 UTC (rev 8948)
+++ trunk/source/configure.in	2005-08-02 20:58:10 UTC (rev 8949)
@@ -1405,7 +1405,6 @@
 			AC_DEFINE(BROKEN_STRNDUP,1,[Does strndup work correctly])
 			;;
 		*hpux*) AC_DEFINE(HPUX,1,[Whether the host os is HPUX])
-			SHLIBEXT="sl"
 			# Use special PIC flags for the native HP-UX compiler.
 			if test $ac_cv_prog_cc_Ae = yes; then
 				BLDSHARED="true"
@@ -1416,7 +1415,13 @@
 			elif test "${GCC}" = "yes"; then
 				PICFLAGS="-fPIC"
 			fi
-			DYNEXP="-Wl,-E"
+			if test "$host_cpu" = "ia64"; then
+				SHLIBEXT="so"
+				DYNEXP="-Wl,-E,+b /usr/local/lib/hpux32:/usr/lib/hpux32"
+			else
+				SHLIBEXT="sl"
+				DYNEXP="-Wl,-E,+b /usr/local/lib:/usr/lib"
+			fi
 			AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
 			AC_DEFINE(POSIX_ACL_NEEDS_MASK,1,[Does a POSIX ACL need a mask element])
 			;;
@@ -1906,7 +1911,8 @@
 dnl succeed when the header is found. To counter this, make sure the 
 dnl library directory is there and check the ABI directory first (which
 dnl should be harmless on other systems.
-    for l in "lib32" "lib" ; do
+dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
+    for l in "lib32" "lib" "lib/hpux32"; do
         if test -d "$i/$l" ; then
                 LDFLAGS="$save_LDFLAGS -L$i/$l"
         LIBS=