add new configure option to enable preloading even on architectures that support...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@700 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 7d7f8f7..6511137 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -398,6 +398,12 @@ if test "x$PREOPEN_MODS" != "xall" ; then
     AC_SUBST(PREOPEN_MODS)
 fi
 
+AC_ARG_ENABLE(
+        [force-preopen],
+        AC_HELP_STRING([--enable-force-preopen],[Preopen modules, even when dlopen() is supported.]),
+        [FORCE_PREOPEN=1], [FORCE_PREOPEN=0])
+AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index a65938e..c5e4638 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,7 +109,6 @@ polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 polypaudio_CPPFLAGS = $(AM_CPPFLAGS) 
 polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
                $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS)
-polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 
 if PREOPEN_MODS
 PREOPEN_LIBS = $(PREOPEN_MODS)
@@ -117,6 +116,12 @@ else
 PREOPEN_LIBS = $(modlib_LTLIBRARIES)
 endif
 
+if FORCE_PREOPEN
+polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
+else
+polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
+endif
+
 ###################################
 #       Utility programs          #
 ###################################