[Spread-cvs] commit: r268 - trunk

jonathan at spread.org jonathan at spread.org
Thu Aug 18 00:09:08 EDT 2005


Author: jonathan
Date: 2005-08-18 00:09:08 -0400 (Thu, 18 Aug 2005)
New Revision: 268

Modified:
   trunk/configure
   trunk/configure.in
Log:
Fix missing AC_SUBST macros for new make variables SHLDCONVERTSTATIC and SHLDCONVERTSTATICEND.


Modified: trunk/configure
===================================================================
--- trunk/configure	2005-08-17 22:30:48 UTC (rev 267)
+++ trunk/configure	2005-08-18 04:09:08 UTC (rev 268)
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S YACC LEX AR PERL LD THLDFLAGS THLIBS EGREP SP_MAJOR_VERSION SP_MINOR_VERSION SP_PATCH_VERSION NROFF MANTYPE mansubdir piddir SHCC SHCFLAGS SHCPPFLAGS SHLD SHLDFLAGS SHLIBS LIBSPSO LIBTSPSO LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S YACC LEX AR PERL LD THLDFLAGS THLIBS EGREP SP_MAJOR_VERSION SP_MINOR_VERSION SP_PATCH_VERSION NROFF MANTYPE mansubdir piddir SHCC SHCFLAGS SHCPPFLAGS SHLD SHLDFLAGS SHLIBS LIBSPSO LIBTSPSO SHLDCONVERTSTATIC SHLDCONVERTSTATICEND LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -8924,8 +8924,8 @@
 	SHLD="$CC -dynamiclib"
 	SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
 	SHLIBS=$LIBS
-	SHLDCONVERTSTATIC="-Wl,-whole-archive"
-	SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
+	SHLDCONVERTSTATIC=
+	SHLDCONVERTSTATICEND=
 	LIBSPSO="libspread.dylib"
 	LIBTSPSO="libtspread.dylib"
         ;;
@@ -8956,6 +8956,8 @@
 
 
 
+
+
                                                   ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9618,6 +9620,8 @@
 s, at SHLIBS@,$SHLIBS,;t t
 s, at LIBSPSO@,$LIBSPSO,;t t
 s, at LIBTSPSO@,$LIBTSPSO,;t t
+s, at SHLDCONVERTSTATIC@,$SHLDCONVERTSTATIC,;t t
+s, at SHLDCONVERTSTATICEND@,$SHLDCONVERTSTATICEND,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-08-17 22:30:48 UTC (rev 267)
+++ trunk/configure.in	2005-08-18 04:09:08 UTC (rev 268)
@@ -670,8 +670,8 @@
 	SHLD="$CC -dynamiclib"
 	SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
 	SHLIBS=$LIBS	
-	SHLDCONVERTSTATIC="-Wl,-whole-archive"
-	SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
+	SHLDCONVERTSTATIC=
+	SHLDCONVERTSTATICEND=
 	LIBSPSO="libspread.dylib"
 	LIBTSPSO="libtspread.dylib"
         ;;
@@ -701,6 +701,8 @@
 AC_SUBST(SHLIBS)
 AC_SUBST(LIBSPSO)
 AC_SUBST(LIBTSPSO)
+AC_SUBST(SHLDCONVERTSTATIC)
+AC_SUBST(SHLDCONVERTSTATICEND)
 
 AC_OUTPUT(Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile)
 




More information about the Spread-cvs mailing list