svn commit: samba r26001 - in branches/SAMBA_4_0: . source/lib/replace

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-16 20:11:48 +0000 (Fri, 16 Nov 2007)
New Revision: 26001

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

Log:
Share some code between macros, add macro specifically for testing the ld flag that allows undefined symbols.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-16 11:50:11 UTC (rev 26000)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-16 20:11:48 UTC (rev 26001)
@@ -214,54 +214,32 @@
 
 AC_DEFUN([AC_LIBREPLACE_MDLD],
 [
-	MDLD="${CC}"
-
-	case "$host_os" in
-		*irix*)
-			MDLD="${PROG_LD}"
-			;;
-	esac
-
+	AC_LIBREPLACE_SHLD()
+	MDLD=$SHLD
 	AC_SUBST(MDLD)
 ])
 
-AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS],
+AC_DEFUN([AC_LIBREPLACE_LD_ALLOW_SHLIB_UNDEF_FLAG],
 [
-	MDLD_FLAGS="-shared"
-
 	case "$host_os" in
 		*linux*)
-			MDLD_FLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+			SHLD_ALLOW_SHLIB_UNDEF_FLAG="-Wl,--allow-shlib-undefined"
 			;;
-		*solaris*)
-			MDLD_FLAGS="-G"
-			if test "${GCC}" = "no"; then
-				## ${CFLAGS} added for building 64-bit shared
-				## libs using Sun's Compiler
-				NDLD_FLAGS="-G \${CFLAGS}"
-			fi
-			;;
-		*sunos*)
-			MDLD_FLAGS="-G"
-			;;
-		*aix*)
-			MDLD_FLAGS="-Wl,-G,-bexpall,-bbigtoc"
-			;;
-		*hpux*)
-			if test "${GCC}" = "yes"; then
-				MDLD_FLAGS="-shared"
-			else
-				MDLD_FLAGS="-b"
-			fi
-			;;
 		*osf*)
-			MDLD_FLAGS="-shared -expect_unresolved '*'"
+			SHLD_ALLOW_SHLIB_UNDEF_FLAG="-expect_unresolved '*'"
 			;;
 		*darwin*)
-			MDLD_FLAGS="-bundle -flat_namespace -undefined suppress -Wl,-search_paths_first"
+			SHLD_ALLOW_SHLIB_UNDEF_FLAG="-undefined suppress"
 			;;
-	esac
+		esac
+		AC_SUBST(SHLD_ALLOW_SHLIB_UNDEF_FLAG)
+])
 
+AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS],
+[
+	AC_LIBREPLACE_SHLD_FLAGS()
+	AC_LIBREPLACE_LD_ALLOW_SHLIB_UNDEF_FLAG()
+	MDLD_FLAGS="$SHLD_FLAGS $SHLD_ALLOW_SHLIB_UNDEF_FLAG"
 	AC_SUBST(MDLD_FLAGS)
 ])