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

[leif at geodynamics.org]

Author: leif
Date: 2007-06-28 18:21:10 -0700 (Thu, 28 Jun 2007)
New Revision: 7557

Modified:
   cs/spatialdata-0.1/trunk/configure.ac
   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:
Another attempt at fixing issue119: conditionally add Python libs to
to the link line.


Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac	2007-06-29 00:35:47 UTC (rev 7556)
+++ cs/spatialdata-0.1/trunk/configure.ac	2007-06-29 01:21:10 UTC (rev 7557)
@@ -48,6 +48,7 @@
     # See issue119.
     AM_LDFLAGS="-no-undefined $AM_LDFLAGS"
 fi
+AM_CONDITIONAL([NO_UNDEFINED], [test "$allow_undefined_flag" = unsupported])
 AC_SUBST(AM_LDFLAGS)
 
 AM_PATH_PYTHON([2.3])

Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-06-29 00:35:47 UTC (rev 7556)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
@@ -24,8 +24,11 @@
 	geocoords.c geocoords_embed.cpp geocoords_embed.h
 
 geocoordsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/libspatialdata.la
+if NO_UNDEFINED
+geocoordsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR)
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-06-29 00:35:47 UTC (rev 7556)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
@@ -24,8 +24,11 @@
 	spatialdb.c spatialdb_embed.cpp spatialdb_embed.h
 
 spatialdbmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/libspatialdata.la
+if NO_UNDEFINED
+spatialdbmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR)
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-06-29 00:35:47 UTC (rev 7556)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
@@ -25,8 +25,11 @@
 simplearraymodule_la_SOURCES = simplearray.pyxe
 nodist_simplearraymodule_la_SOURCES = \
 	simplearray.c simplearray_embed.cpp simplearray_embed.h
-simplearraymodule_la_LIBADD = \
+simplearraymodule_la_LIBADD =
+if NO_UNDEFINED
+simplearraymodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 # utils
 utilsmodule_la_LDFLAGS = -module -avoid-version \
@@ -35,8 +38,11 @@
 nodist_utilsmodule_la_SOURCES = \
 	utils.c utils_embed.cpp utils_embed.h
 utilsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/libspatialdata.la
+if NO_UNDEFINED
+utilsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 # simple array targets
 simplearray.pyx simplearray_embed.cpp  simplearray_embed.h: simplearray.pyxe

Modified: cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am	2007-06-29 00:35:47 UTC (rev 7556)
+++ cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
@@ -25,10 +25,12 @@
 
 testcppmodule_la_LDFLAGS = -module -avoid-version \
 	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-testcppmodule_la_LIBADD = \
+testcppmodule_la_LIBADD =
+if NO_UNDEFINED
+testcppmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
-
 testcppmodule_la_SOURCES = testcpp.pyxe
 
 nodist_testcppmodule_la_SOURCES = \