libextractor

commit 5cef91f0925e4f138279fa960074bd7e0882c72e
parent 9085ceadbf6fe4993a025564d10a78c9f9c45484
Author: Heikki Lindholm <holin@iki.fi>
Date:   Sat, 26 Dec 2009 19:36:43 +0000

try to decrease hard-coding


Diffstat:
M
configure.ac
 | 
6
+++++-
M
src/main/Makefile.am
 | 
11
++---------

2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -274,7 +274,10 @@ AC_FUNC_VPRINTF
 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_LIB_LDFLAGS)
 AC_SUBST(LE_PLUGIN_LDFLAGS)
 AC_SUBST(LE_INTLINCL)
 AC_SUBST(LE_LIBINTL)
+AC_SUBST(LE_EXTRACTOR_LIBS)
 
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/src/include $(LTDLINCL)
 plugindir = $(libdir)/@RPLUGINDIR@
 
 LIBS = \
- @LE_LIBINTL@ @LIBS@
+ @LE_LIBINTL@ @LE_EXTRACTOR_LIBS@
 
 lib_LTLIBRARIES = \
   libextractor.la 
@@ -16,13 +16,6 @@ bin_PROGRAMS = extract
 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 @@ endif
 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 = \