[ltt-dev] [PATCH 3/4] lttv: Fix configure arguments

Benjamin Poirier benjamin.poirier at polymtl.ca
Fri Jul 31 17:09:23 EDT 2009


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 <benjamin.poirier at polymtl.ca>
---
 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 87b034b..c630e6b 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 926c014..67da0ca 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 241c42c..162dbfd 100644
--- a/lttv/lttv/Makefile.am
+++ b/lttv/lttv/Makefile.am
@@ -59,6 +59,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
 
-- 
1.6.3.3






More information about the lttng-dev mailing list