diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7d7f8f73..6511137e 100644 --- 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 a65938ef..c5e4638b 100644 --- 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 # ################################### |