[GNUnet-SVN] r7849 - in Extractor/src: main plugins

[gnunet]

Author: durner
Date: 2008-11-04 12:15:10 -0700 (Tue, 04 Nov 2008)
New Revision: 7849

Modified:
   Extractor/src/main/Makefile.am
   Extractor/src/plugins/Makefile-plugins.am
Log:
fix 
        ../../libtool: eval: line 1: syntax error near unexpected token `|'
on MinGW

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2008-11-04 08:18:05 UTC (rev 7848)
+++ Extractor/src/main/Makefile.am      2008-11-04 19:15:10 UTC (rev 7849)
@@ -17,10 +17,13 @@
   $(top_builddir)/src/main/libextractor.la 
 
 if !MINGW
-if !SOMEBSD
-  dlflag=-ldl
+  exportflag=-export-symbols-regex "EXTRACTOR_[a-zA-Z0-9_]*"
+  if !SOMEBSD
+    dlflag=-ldl
+  endif
+else
+  winexportflag=-export-dynamic
 endif
-endif
 
 if HAVE_ZLIB
   zlib =-lz
@@ -36,7 +39,7 @@
 endif
 
 libextractor_la_LDFLAGS = \
-  -export-dynamic -export-symbols-regex "EXTRACTOR_[a-zA-Z0-9_]*" 
-version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ 
$(LIBICONV)
+  $(exportflag) $(winexportflag) -version-info 
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ $(LIBICONV)
 libextractor_la_LIBADD = \
   $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib) $(GSF_LIBS_X) -lpthread
 libextractor_la_DEPENDENCIES = \

Modified: Extractor/src/plugins/Makefile-plugins.am
===================================================================
--- Extractor/src/plugins/Makefile-plugins.am   2008-11-04 08:18:05 UTC (rev 
7848)
+++ Extractor/src/plugins/Makefile-plugins.am   2008-11-04 19:15:10 UTC (rev 
7849)
@@ -6,10 +6,13 @@
 LIBS = \
  @LTLIBINTL@ @LIBS@
 
+if !MINGW
+  retaincommand=-export-symbols-regex "libextractor_[a-zA-Z0-9_]*_extract"
+endif
+
 if HAVE_GNU_LD
  makesymbolic=-Wl,-Bsymbolic
 endif
-retaincommand=-export-symbols-regex "libextractor_[a-zA-Z0-9_]*_extract"
 
 PLUGINFLAGS = $(makesymbolic) -avoid-version -module -no-undefined