[GNUnet-SVN] r9900 - in Extractor: . src/main

[gnunet]

Author: holindho
Date: 2009-12-26 20:36:43 +0100 (Sat, 26 Dec 2009)
New Revision: 9900

Modified:
   Extractor/configure.ac
   Extractor/src/main/Makefile.am
Log:
try to decrease hard-coding


Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2009-12-26 12:08:18 UTC (rev 9899)
+++ Extractor/configure.ac      2009-12-26 19:36:43 UTC (rev 9900)
@@ -274,7 +274,10 @@
 AC_FUNC_MMAP
 AC_FUNC_STAT
 AC_FUNC_ERROR_AT_LINE
-AC_CHECK_FUNCS([mkstemp strndup munmap strcasecmp strdup strncasecmp memmove 
memset strtoul floor getcwd pow setenv sqrt strchr strcspn strrchr strnlen 
strndup ftruncate])
+AC_SEARCH_LIBS(shm_open, rt)
+AC_CHECK_FUNCS([mkstemp strndup munmap strcasecmp strdup strncasecmp memmove 
memset strtoul floor getcwd pow setenv sqrt strchr strcspn strrchr strnlen 
strndup ftruncate shm_open shm_unlink])
+LE_EXTRACTOR_LIBS=$LIBS
+LIBS=$LIBSOLD
 
 AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
@@ -530,6 +533,7 @@
 AC_SUBST(LE_PLUGIN_LDFLAGS)
 AC_SUBST(LE_INTLINCL)
 AC_SUBST(LE_LIBINTL)
+AC_SUBST(LE_EXTRACTOR_LIBS)
 
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2009-12-26 12:08:18 UTC (rev 9899)
+++ Extractor/src/main/Makefile.am      2009-12-26 19:36:43 UTC (rev 9900)
@@ -6,7 +6,7 @@
 plugindir = $(libdir)/@RPLUGINDIR@
 
 LIBS = \
- @LE_LIBINTL@ @LIBS@
+ @LE_LIBINTL@ @LE_EXTRACTOR_LIBS@
 
 lib_LTLIBRARIES = \
   libextractor.la 
@@ -16,13 +16,6 @@
 extract_LDADD = \
   $(top_builddir)/src/main/libextractor.la 
 
-if !MINGW
-    rtflag=-lrt
-if !SOMEBSD
-    dlflag=-ldl
-endif
-endif
-
 if HAVE_ZLIB
   zlib =-lz
 endif
@@ -33,7 +26,7 @@
 libextractor_la_LDFLAGS = \
   $(LE_LIB_LDFLAGS) -version-info 
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 libextractor_la_LIBADD = \
-  $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib) $(LIBICONV) $(rtflag)
+  $(LIBLTDL) $(zlib) $(bz2lib) $(LIBICONV)
 
 
 EXTRA_DIST = \