From 7d3dcbe0d57bd780a3c392a9aa555eb1d52c6cca Mon Sep 17 00:00:00 2001 From: Benjamin Poirier Date: Mon, 10 Aug 2009 16:38:20 -0400 Subject: [PATCH] lttv: Fix configure arguments Remove the unused maintainer mode switch. Fix argument processing for static link mode. Note that it has little effect on the actual build process since the modules are still dlopen()'ned. Signed-off-by: Benjamin Poirier --- autogen.sh | 3 --- configure.in | 7 ++++++- lttv/lttv/Makefile.am | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 87b034b3..c630e6b0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -148,9 +148,6 @@ do fi done -conf_flags="--enable-maintainer-mode" - - #if [ -a "$srcdir/include" ]; then # echo -n Removing old system include behavior emulation... # rm -rf $srcdir/include diff --git a/configure.in b/configure.in index 926c0142..67da0ca4 100644 --- a/configure.in +++ b/configure.in @@ -87,7 +87,12 @@ AC_CHECK_FUNCS([select]) #CPPFLAGS="$CPPFLAGS -I" -AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes) +AC_ARG_ENABLE(lttvstatic, + AC_HELP_STRING( [--enable-lttvstatic], + [Build a statically linked executable @<:@default=no@:>@]), + [with_lttvstatic="yes"], + [with_lttvstatic="no"]) +AM_CONDITIONAL(LTTVSTATIC, test "x$with_lttvstatic" = "xyes") lttvlibdir="${libdir}/lttv" lttvplugindir="${lttvlibdir}/plugins" #lttlibdir="${libdir}/ltt" diff --git a/lttv/lttv/Makefile.am b/lttv/lttv/Makefile.am index 944d5988..b0bc52f4 100644 --- a/lttv/lttv/Makefile.am +++ b/lttv/lttv/Makefile.am @@ -45,6 +45,6 @@ lttv_real_SOURCES = batchtest.c main.c module.c option.c \ lttv_real_LDFLAGS = -export-dynamic if LTTVSTATIC - lttv_real_LDFLAGS += -profile -static + lttv_real_LDFLAGS += -static endif -- 2.34.1