svn commit: samba r15190 - in branches/SAMBA_4_0/source/build/m4: .

jelmer at samba.org jelmer at samba.org
Mon Apr 24 09:34:23 GMT 2006


Author: jelmer
Date: 2006-04-24 09:34:22 +0000 (Mon, 24 Apr 2006)
New Revision: 15190

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

Log:
Disable sonames for the BSDs and solaris as they don't take more then 
one version number (0 rather then 0.0.1)

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2006-04-24 02:36:55 UTC (rev 15189)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2006-04-24 09:34:22 UTC (rev 15190)
@@ -112,11 +112,10 @@
 # these are the defaults, good for lots of systems
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
-SONAMEFLAG="#"
+SONAMEFLAG=""
 SHLD="\${CC}"
 PICFLAG=""
 PICSUFFIX="po"
-POBAD_CC="#"
 SHLIBEXT="so"
 
 AC_MSG_CHECKING([ability to build shared libraries])
@@ -134,7 +133,6 @@
 	*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
 		BLDSHARED="true"
 		LDSHFLAGS="-G"
-		SONAMEFLAG="-h "
 		if test "${GCC}" = "yes"; then
 			PICFLAG="-fPIC"
 			if test "${ac_cv_prog_gnu_ld}" = "yes"; then
@@ -145,7 +143,6 @@
 			## ${CFLAGS} added for building 64-bit shared 
 			## libs using Sun's Compiler
 			LDSHFLAGS="-G \${CFLAGS}"
-			POBAD_CC=""
 			PICSUFFIX="po.o"
 		fi
 		AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
@@ -153,21 +150,18 @@
 	*sunos*) AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
 		BLDSHARED="true"
 		LDSHFLAGS="-G"
-		SONAMEFLAG="-Wl,-h,"
 		PICFLAG="-KPIC"   # Is this correct for SunOS
 		AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 		;;
 	*netbsd* | *freebsd*)  BLDSHARED="true"
 		LDSHFLAGS="-shared"
 		DYNEXP="-Wl,--export-dynamic"
-		SONAMEFLAG="-Wl,-soname,"
 		PICFLAG="-fPIC -DPIC"
 		AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
 		;;
 	*openbsd*)  BLDSHARED="true"
 		LDSHFLAGS="-shared"
 		DYNEXP="-Wl,-Bdynamic"
-		SONAMEFLAG="-Wl,-soname,"
 		PICFLAG="-fPIC"
 		AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
 		;;



More information about the samba-cvs mailing list