[polypaudio-commits] r700 - in /trunk: configure.ac src/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Apr 13 19:32:10 2006
New Revision: 700

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=700&root=polypaudio&view=rev
Log:
add new configure option to enable preloading even on architectures that support dlopen(). Useful for debugging

Modified:
    trunk/configure.ac
    trunk/src/Makefile.am

Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=700&root=polypaudio&r1=699&r2=700&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Apr 13 19:32:10 2006
@@ -397,6 +397,12 @@
     PREOPEN_MODS="$tmpLIBS"
     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

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=700&root=polypaudio&r1=699&r2=700&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Apr 13 19:32:10 2006
@@ -109,12 +109,17 @@
 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)
 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
 
 ###################################