[cig-commits] r7388 - in cs/spatialdata-0.1/trunk: . libsrc modulesrc/geocoords modulesrc/spatialdb modulesrc/utils tests/pytests/utils

[leif at geodynamics.org]

Author: leif
Date: 2007-06-22 13:17:19 -0700 (Fri, 22 Jun 2007)
New Revision: 7388

Modified:
   cs/spatialdata-0.1/trunk/configure.ac
   cs/spatialdata-0.1/trunk/libsrc/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
   cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am
Log:
Add "-no-undefined" only on Windows.  See issue119.


Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/configure.ac	2007-06-22 20:17:19 UTC (rev 7388)
@@ -42,7 +42,14 @@
 
 AC_PROG_CXX
 AC_PROG_CC
+
 AC_PROG_LIBTOOL
+if test "$allow_undefined_flag" = unsupported; then
+    # See issueXXX.
+    AM_LDFLAGS="-no-undefined $AM_LDFLAGS"
+fi
+AC_SUBST(AM_LDFLAGS)
+
 AM_PATH_PYTHON([2.3])
 
 # ----------------------------------------------------------------------

Modified: cs/spatialdata-0.1/trunk/libsrc/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2007-06-22 20:17:19 UTC (rev 7388)
@@ -36,7 +36,7 @@
 	spatialdb/SimpleIOAscii.cc \
 	spatialdb/cspatialdb.cc	
 
-libspatialdata_la_LDFLAGS = -no-undefined
+libspatialdata_la_LDFLAGS = $(AM_LDFLAGS)
 
 CPPFLAGS += -DDATADIR="$(pkgdatadir)/geocoords"
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-06-22 20:17:19 UTC (rev 7388)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = geocoordsmodule.la
 
-geocoordsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+geocoordsmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 geocoordsmodule_la_SOURCES = geocoords.pyxe
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-06-22 20:17:19 UTC (rev 7388)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = spatialdbmodule.la
 
-spatialdbmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+spatialdbmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 spatialdbmodule_la_SOURCES = spatialdb.pyxe
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-06-22 20:17:19 UTC (rev 7388)
@@ -20,8 +20,8 @@
 INCLUDES += -I$(PYTHON_INCDIR)
 
 # simple array
-simplearraymodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+simplearraymodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 simplearraymodule_la_SOURCES = simplearray.pyxe
 nodist_simplearraymodule_la_SOURCES = \
 	simplearray.c simplearray_embed.cpp simplearray_embed.h
@@ -29,8 +29,8 @@
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 # utils
-utilsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+utilsmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 utilsmodule_la_SOURCES = utils.pyxe
 nodist_utilsmodule_la_SOURCES = \
 	utils.c utils_embed.cpp utils_embed.h

Modified: cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am	2007-06-22 19:52:01 UTC (rev 7387)
+++ cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am	2007-06-22 20:17:19 UTC (rev 7388)
@@ -23,8 +23,8 @@
 # module
 subpkgpyexec_LTLIBRARIES = testcppmodule.la
 
-testcppmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+testcppmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 testcppmodule_la_LIBADD = \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)