Rev 11614: Allow modification of LDFLAGS in file:///home/jelmer/bzr.samba/SAMBA_4_0/

Jelmer Vernooij jelmer at samba.org
Wed Feb 28 10:49:39 GMT 2007


At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11614
revision-id: jelmer at samba.org-20070228104928-qblk4we17a6wyqds
parent: svn-v2:21580 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Wed 2007-02-28 11:49:28 +0100
message:
  Allow modification of LDFLAGS
modified:
  source/build/m4/check_ld.m4    svn-v2:7274 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fbuild%2fm4%2fcheck_ld.m4
=== modified file 'source/build/m4/check_ld.m4'
--- a/source/build/m4/check_ld.m4	2007-01-15 18:44:06 +0000
+++ b/source/build/m4/check_ld.m4	2007-02-28 10:49:28 +0000
@@ -30,7 +30,6 @@
 STLD_FLAGS="-rcs"
 BLDSHARED="false"
 LD="${CC}"
-LDFLAGS=""
 SHLD="${CC}"
 SHLD_FLAGS="-shared"
 SHLIBEXT="so"
@@ -45,7 +44,7 @@
 		BLDSHARED="true"
 		SHLD_FLAGS="-shared -Wl,-Bsymbolic"
 		SHLD_UNDEF_FLAGS="-Wl,--allow-shlib-undefined"
-		LDFLAGS="-Wl,--export-dynamic"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 		PICFLAG="-fPIC"
 		SONAMEFLAG="-Wl,-soname="
 		;;
@@ -57,7 +56,7 @@
 			PICFLAG="-fPIC"
 			SONAMEFLAG="-Wl,-soname="
 			if test "${ac_cv_prog_gnu_ld}" = "yes"; then
-				LDFLAGS="-Wl,-E"
+				LDFLAGS="$LDFLAGS -Wl,-E"
 			fi
 		else
 			PICFLAG="-KPIC"
@@ -74,13 +73,13 @@
 		;;
 	*netbsd* | *freebsd* | *dragonfly* )  
 		BLDSHARED="true"
-		LDFLAGS="-Wl,--export-dynamic"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 		SONAMEFLAG="-Wl,-soname,"
 		PICFLAG="-fPIC -DPIC"
 		;;
 	*openbsd*)
 		BLDSHARED="true"
-		LDFLAGS="-Wl,-Bdynamic"
+		LDFLAGS="$LDFLAGS -Wl,-Bdynamic"
 		SONAMEFLAG="-Wl,-soname,"
 		PICFLAG="-fPIC"
 		;;
@@ -98,7 +97,7 @@
 	*aix*)
 		BLDSHARED="true"
 		SHLD_FLAGS="-Wl,-G,-bexpall,-bbigtoc"
-		LDFLAGS="-Wl,-brtl,-bexpall,-bbigtoc"
+		LDFLAGS="$LDFLAGS -Wl,-brtl,-bexpall,-bbigtoc"
 		# as AIX code is always position independent...
 		PICFLAG="-O2"
 		;;
@@ -115,10 +114,10 @@
 		fi
 		if test "$host_cpu" = "ia64"; then
 			SHLIBEXT="so"
-			LDFLAGS="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
+			LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
 		else
 			SHLIBEXT="sl"
-			LDFLAGS="-Wl,-E,+b/usr/local/lib:/usr/lib"
+			LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib:/usr/lib"
 		fi
 		;;
 	*osf*)



More information about the samba-cvs mailing list