From 59cf55abd8862b0ba29228e9bd91076d477a750b Mon Sep 17 00:00:00 2001
From: "Matthew P. Legendre" <legendre@rzdawndev2.llnl.gov>
Date: Wed, 13 Jul 2011 16:28:06 -0700
Subject: [PATCH] Re-add launchmon options to autoconf

---
 autodyninst/make.config.local.in |  4 ++++
 configure                        | 21 ++++++++++++++++++++-
 configure.in                     |  9 +++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/autodyninst/make.config.local.in b/autodyninst/make.config.local.in
index 88f4d1d..5f28311 100644
--- a/autodyninst/make.config.local.in
+++ b/autodyninst/make.config.local.in
@@ -37,6 +37,10 @@ LIBDWARF_HASSETFRAME = @LIBDWARF_HAS_SET_FRAME@
 LIBXML2_LIB	= @LIBXML2_LIB_DIR@
 LIBXML2_INC	= @LIBXML2_INC_DIR@
 
+#LaunchMON used on BlueGene by the testsuite
+LAUNCHMON_LIB = @LAUNCHMON_LIB_DIR@
+LAUNCHMON_INC = @LAUNCHMON_INC_DIR@
+
 #Thread_db is required by FreeBSD and BlueGene, and is optional on Linux
 THREAD_DB_LIB = @THREADDB_LIB_DIR@
 THREAD_DB_INC = @THREADDB_INC_DIR@
diff --git a/configure b/configure
index aa79bae..402de50 100755
--- a/configure
+++ b/configure
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT _ICC_ _ICPC_ _PGC_ _PGCXX_ _CC_ _CXX_ USE_TCL83 TCLTK_INC_DIR TCLTK_LIB_DIR DEFAULT_COMPONENT build build_cpu build_vendor build_os host host_cpu host_vendor host_os ARG_WRAPPER_LIBS CXXCPP EGREP LIBELF_INC_DIR LIBELF_LIB_DIR LIBELF_STATIC LIBELF_DYNAMIC BUILD_XLC GNU_DEMANGLER USE_LIBERTY LINK_LIBERTY LIBIBERTY_LIB_DIR LIBDWARF_INC_DIR LIBDWARF_LIB_DIR LIBDWARF_STATIC LIBDWARF_DYNAMIC LIBDWARF_HAS_SET_FRAME THREADDB_INC_DIR THREADDB_LIB_DIR THREADDB_STATIC THREADDB_DYNAMIC HAVE_THREADDB LIBXML2_INC_DIR LIBXML2_LIB_DIR LIBFLEX_LIB_DIR NASM STACKPROT BUILD32 MMTIMER TESTSUITE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT _ICC_ _ICPC_ _PGC_ _PGCXX_ _CC_ _CXX_ USE_TCL83 TCLTK_INC_DIR TCLTK_LIB_DIR DEFAULT_COMPONENT build build_cpu build_vendor build_os host host_cpu host_vendor host_os ARG_WRAPPER_LIBS CXXCPP EGREP LIBELF_INC_DIR LIBELF_LIB_DIR LIBELF_STATIC LIBELF_DYNAMIC BUILD_XLC GNU_DEMANGLER USE_LIBERTY LINK_LIBERTY LIBIBERTY_LIB_DIR LIBDWARF_INC_DIR LIBDWARF_LIB_DIR LIBDWARF_STATIC LIBDWARF_DYNAMIC LIBDWARF_HAS_SET_FRAME THREADDB_INC_DIR THREADDB_LIB_DIR THREADDB_STATIC THREADDB_DYNAMIC HAVE_THREADDB LIBXML2_INC_DIR LIBXML2_LIB_DIR LAUNCHMON_INC_DIR LAUNCHMON_LIB_DIR LIBFLEX_LIB_DIR NASM STACKPROT BUILD32 MMTIMER TESTSUITE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -873,6 +873,8 @@ Optional Packages:
   --with-threaddb-libdir  THREADDB library directory
   --with-libxml2-incdir   LIBXML2 include directory
   --with-libxml2-libdir   LIBXML2 library directory
+  --with-launchmon-incdir Launchmon include directory
+  --with-launchmon-libdir Launchmon library directory
   --with-libflex-libdir   Absolute path to flex library
 
 Some influential environment variables:
@@ -5885,6 +5887,21 @@ fi
 
 
 
+# Check whether --with-launchmon-incdir or --without-launchmon-incdir was given.
+if test "${with_launchmon_incdir+set}" = set; then
+  withval="$with_launchmon_incdir"
+  LAUNCHMON_INC_DIR="${withval}";
+fi;
+
+# Check whether --with-launchmon-libdir or --without-launchmon-libdir was given.
+if test "${with_launchmon_libdir+set}" = set; then
+  withval="$with_launchmon_libdir"
+  LAUNCHMON_LIB_DIR="${withval}";
+fi;
+
+
+
+
 # Check whether --with-libflex-libdir or --without-libflex-libdir was given.
 if test "${with_libflex_libdir+set}" = set; then
   withval="$with_libflex_libdir"
@@ -7005,6 +7022,8 @@ s,@THREADDB_DYNAMIC@,$THREADDB_DYNAMIC,;t t
 s,@HAVE_THREADDB@,$HAVE_THREADDB,;t t
 s,@LIBXML2_INC_DIR@,$LIBXML2_INC_DIR,;t t
 s,@LIBXML2_LIB_DIR@,$LIBXML2_LIB_DIR,;t t
+s,@LAUNCHMON_INC_DIR@,$LAUNCHMON_INC_DIR,;t t
+s,@LAUNCHMON_LIB_DIR@,$LAUNCHMON_LIB_DIR,;t t
 s,@LIBFLEX_LIB_DIR@,$LIBFLEX_LIB_DIR,;t t
 s,@NASM@,$NASM,;t t
 s,@STACKPROT@,$STACKPROT,;t t
diff --git a/configure.in b/configure.in
index 711b6e6..42a63b8 100644
--- a/configure.in
+++ b/configure.in
@@ -328,6 +328,15 @@ PD_SOFT_CHECK_LIB_DIR($LIBXML2_LIB_DIR,[xml2],[xmlAddID])
 AC_SUBST(LIBXML2_INC_DIR)
 AC_SUBST(LIBXML2_LIB_DIR)
 
+AC_ARG_WITH(launchmon-incdir,
+            [AS_HELP_STRING([--with-launchmon-incdir],[Launchmon include directory])],
+            [LAUNCHMON_INC_DIR="${withval}";],)
+AC_ARG_WITH(launchmon-libdir,
+            [AS_HELP_STRING([--with-launchmon-libdir],[Launchmon library directory])],
+            [LAUNCHMON_LIB_DIR="${withval}";],)
+AC_SUBST(LAUNCHMON_INC_DIR)
+AC_SUBST(LAUNCHMON_LIB_DIR)
+
 AC_ARG_WITH(libflex-libdir,
             [AS_HELP_STRING([--with-libflex-libdir],[Absolute path to flex library])],
             [LIBFLEX_LIB_DIR="${withval}";],)
-- 
1.8.3.1