diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 21:39:49 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 21:39:49 +0000 |
| commit | be2ba901751755f1673b0559a29fdcb9ca651405 (patch) | |
| tree | 5e5c0006255034200b3117dfb946918b39af0746 | |
| parent | 9550c8ed80dee1aa7ced2d18144fd7b1a3b5a395 (diff) | |
Add option to select which modules get linked in during static builds.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@404 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | polyp/Makefile.am | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 08f7e2b0..941be8b7 100644 --- a/configure.ac +++ b/configure.ac @@ -297,6 +297,20 @@ AC_ARG_ENABLE( [STATIC_BINS=1], [STATIC_BINS=0]) AM_CONDITIONAL([STATIC_BINS], [test "x$STATIC_BINS" = "x1"]) +AC_ARG_WITH( + [preopen-mods], + AC_HELP_STRING([--with-preopen-mods],[Modules to preopen in daemon (default: all).]), + [PREOPEN_MODS=$withval], [PREOPEN_MODS="all"]) +AM_CONDITIONAL([PREOPEN_MODS], [test "x$PREOPEN_MODS" != "xall"]) +if test "x$PREOPEN_MODS" != "xall" ; then + tmpLIBS="" + for mod in $PREOPEN_MODS; do + tmpLIBS="$tmpLIBS module-$mod.la" + done + PREOPEN_MODS="$tmpLIBS" + AC_SUBST(PREOPEN_MODS) +fi + AC_CONFIG_FILES([ Makefile polyp/Makefile diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 614a187c..a066813d 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -93,8 +93,13 @@ polypaudio_CFLAGS = $(AM_CFLAGS) polypaudio_CPPFLAGS = $(AM_CPPFLAGS) polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \ $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) -polypaudio_LDFLAGS= $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force -#q-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f)) +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 ################################### # Utility programs # |