From a88ff781bfab2efcc36ac67e875c567bbc577cab Mon Sep 17 00:00:00 2001
From: "Matthew P. Legendre" <legendre@zeus286.llnl.gov>
Date: Wed, 29 Dec 2010 16:24:57 -0800
Subject: [PATCH] Autoconf support for building subsets of components. 
 Thread_db support in autoconf.

---
 Makefile                                    |   57 +-
 aclocal.m4                                  |   16 +
 autodyninst/default_component               |    1 +
 autodyninst/make.config.local.in            |   12 +
 configure                                   | 1207 +++++++++++++++++++++++----
 configure.in                                |  160 +++-
 make.config                                 |   74 +-
 make.library.tmpl                           |    7 +-
 testsuite/amd64-unknown-freebsd7.2/Makefile |    1 +
 testsuite/i386-unknown-freebsd7.2/Makefile  |    1 +
 testsuite/i386-unknown-linux2.4/Makefile    |    1 +
 testsuite/ppc32_linux/Makefile              |    1 +
 testsuite/ppc64_linux/Makefile              |    1 +
 testsuite/rs6000-ibm-aix5.1/Makefile        |    1 +
 testsuite/sparc-sun-solaris2.8/Makefile     |    1 +
 testsuite/x86_64-unknown-linux2.4/Makefile  |    1 +
 16 files changed, 1295 insertions(+), 247 deletions(-)
 create mode 100644 autodyninst/default_component

diff --git a/Makefile b/Makefile
index d112ec4..f56ba52 100644
--- a/Makefile
+++ b/Makefile
@@ -12,39 +12,7 @@ include ./make.config
 
 BUILD_ID = "$(SUITE_NAME) v$(RELEASE_NUM)$(BUILD_MARK)$(BUILD_NUM)"
 
-SymtabAPI 	= ready common symtabAPI dynutil
-StackwalkerAPI = ready common symtabAPI stackwalk
-DyninstAPI	= ready common symtabAPI instructionAPI parseAPI dyninstAPI_RT dyninstAPI dynutil
-InstructionAPI	= ready common instructionAPI dynutil
-ProcControlAPI = ready common proccontrol
-DepGraphAPI = depGraphAPI
-ParseAPI = ready common symtabAPI instructionAPI parseAPI
-ValueAdded = valueAdded/sharedMem
-#DataflowAPI = instructionAPI parseAPI dataflowAPI
-DataflowAPI = ParseAPI
-
-testsuites = dyninstAPI/tests 
 allSubdirs_noinstall =
-
-ifndef DONT_BUILD_DYNINST
-fullSystem	+= $(DyninstAPI)
-Build_list	+= DyninstAPI
-endif
-
-ifndef DONT_BUILD_PROCCONTROL
-fullSystem += proccontrol
-Build_list += proccontrol
-endif
-
-ifndef DONT_BUILD_NEWTESTSUITE
-testsuites += testsuite parseThat
-allSubdirs_noinstall += testsuite 
-fullSystem += testsuite parseThat
-Build_list += testsuite parseThat
-endif
-
-fullSystem += parseAPI
-
 allCoreSubdirs	= dyninstAPI_RT common dyninstAPI symtabAPI dynutil instructionAPI parseAPI
 allSubdirs	= $(allCoreSubdirs) parseThat testsuite valueAdded/sharedMem depGraphAPI stackwalk proccontrol 
 
@@ -54,7 +22,7 @@ allSubdirs	= $(allCoreSubdirs) parseThat testsuite valueAdded/sharedMem depGraph
 # Note that the first rule listed ("all") is what gets made by default,
 # i.e., if make is given no arguments.  Don't add other targets before all!
 
-all: ready world
+all: world
 
 # This rule makes most of the normal recursive stuff.  Just about any
 # target can be passed down to the lower-level Makefiles by listing it
@@ -78,11 +46,11 @@ clean distclean:
 	    fi							\
 	done
 
-install:	ready world
+install:	intro ready
 	+@for subsystem in $(fullSystem); do 			\
 		if [ -f $$subsystem/$(PLATFORM)/Makefile ]; then	\
 			$(MAKE) -C $$subsystem/$(PLATFORM) install;		\
-		elif [ -f $$subsytem/Makefile ]; then 			\
+		elif [ -f $$subsystem/Makefile ]; then 			\
 			$(MAKE) -C $$subsystem install; \
 	   else	\
 			true;						\
@@ -104,10 +72,6 @@ ready:
 	    fi							\
 	done
 
-	+@if [ ! -f make.config.local ]; then	\
-	    touch make.config.local;		\
-	fi
-
 	+@echo "Primary compiler for Paradyn build is:"
 	+@if [ `basename $(CXX)` = "xlC" ]; then		\
                echo "xlC"; \
@@ -133,10 +97,7 @@ ready:
 # unnecessary work.
 
 intro:
-	@echo "Build of $(BUILD_ID) starting for $(PLATFORM)!"
-ifdef DONT_BUILD_DYNINST
-	@echo "Build of DyninstAPI components skipped!"
-endif
+	@echo "Build of $(BUILD_ID) on $(PLATFORM) for $(DEFAULT_COMPONENT): $(fullSystem)"
 
 world: intro
 	$(MAKE) $(fullSystem)
@@ -157,11 +118,9 @@ DyninstAPI SymtabAPI StackwalkerAPI basicComps subSystems testsuites Instruction
 
 $(allSubdirs): 
 	@if [ -f $@/$(PLATFORM)/Makefile ]; then \
-		$(MAKE) -C $@/$(PLATFORM) && \
-		$(MAKE) -C $@/$(PLATFORM) install; \
+		$(MAKE) -C $@/$(PLATFORM); \
 	elif [ -f $@/Makefile ]; then \
-		$(MAKE) -C $@ && \
-		$(MAKE) -C $@ install; \
+		$(MAKE) -C $@; \
 	else \
 		echo $@ has no Makefile; \
 		true; \
@@ -208,9 +167,7 @@ stackwalk: symtabAPI dynutil
 dyninstAPI: symtabAPI instructionAPI parseAPI common dynutil
 instructionAPI: common dynutil
 symtabAPI dyninstAPI: dynutil
-dyner codeCoverage dyninstAPI/tests testsuite: dyninstAPI
-testsuite: $(coreSubdirs_explicitInstall)
-testsuite: parseThat
+dyner codeCoverage: dyninstAPI
 parseThat: $(coreSubdirs_explicitInstall)
 proccontrol: common dynutil
 parseAPI: symtabAPI instructionAPI common dynutil
diff --git a/aclocal.m4 b/aclocal.m4
index 5899f90..72a34c2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -57,6 +57,22 @@ AC_DEFUN(PD_CHECK_LIB_DIR,[
   fi
 ])
 
+AC_DEFUN(PD_CHECK_LIB_DIR_WERR,[
+  if test "$1" = "" ; then
+    AC_CHECK_LIB($2, $3, [], $6)
+  else
+    LIBS_HOLD=$LIBS
+    if test "$4" != "" ; then
+      LIBS="-L$1 -L$4"
+      AC_CHECK_LIB($2, $3, [], $6, $5)
+    else
+      LIBS="-L$1"
+      AC_CHECK_LIB($2, $3, [], $6)
+    fi
+    LIBS=$LIBS_HOLD
+  fi
+])
+
 AC_DEFUN(PD_SOFT_CHECK_LIB_DIR,[
   if test "$1" = "" ; then
     AC_CHECK_LIB($2, $3, [], [AC_MSG_RESULT(Can't find lib$2.)])
diff --git a/autodyninst/default_component b/autodyninst/default_component
new file mode 100644
index 0000000..4ad96d5
--- /dev/null
+++ b/autodyninst/default_component
@@ -0,0 +1 @@
+default
diff --git a/autodyninst/make.config.local.in b/autodyninst/make.config.local.in
index d2ca477..e2c3d20 100644
--- a/autodyninst/make.config.local.in
+++ b/autodyninst/make.config.local.in
@@ -41,6 +41,17 @@ LIBXML2_INC	= @LIBXML2_INC_DIR@
 LIBUNWIND_LIB = @LIBUNWIND_LIB_DIR@
 LIBUNWIND_INC = @LIBUNWIND_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@
+THREAD_DB_STATIC = @THREADDB_STATIC@
+THREAD_DB_DYNAMIC = @THREADDB_DYNAMIC@
+HAVE_THREAD_DB = @HAVE_THREADDB@
+
 WRAPPER_LIBS = @ARG_WRAPPER_LIBS@
 
 #build Paradyn using Tcl/Tk 8.3
@@ -62,6 +73,7 @@ LINK_LIBERTY = @LINK_LIBERTY@
 #nice to have: where is libiberty?
 LIBIBERTY_LIB = @LIBIBERTY_LIB_DIR@
 
+DEFAULT_COMPONENT = @DEFAULT_COMPONENT@
 
 #nasm is needed for the Linux/x86 dyninst tests
 NASM = @NASM@
diff --git a/configure b/configure
index b6593eb..143ae16 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 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 LIBXML2_INC_DIR LIBXML2_LIB_DIR LIBUNWIND_INC_DIR LIBUNWIND_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 LIBUNWIND_INC_DIR LIBUNWIND_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.
@@ -855,6 +855,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-package-base     Base directory to look for packages
+  --with-default-component
+                          Valid values: DyninstAPI, SymtabAPI, InstructionAPI,
+                          ProcControlAPI, ParseAPI, default
   --with-tcl83            Use Tcl/Tk 8.3
   --with-tcltk-incdir     TCL/TK include directory
   --with-tcltk-libdir     TCL/TK library directory
@@ -866,10 +869,14 @@ Optional Packages:
   --with-libiberty-libdir LIBIBERTY library directory
   --with-libdwarf-incdir  LIBDWARF include directory
   --with-libdwarf-libdir  LIBDWARF library directory
+  --with-threaddb-incdir  THREADDB include directory
+  --with-threaddb-libdir  THREADDB library directory
   --with-libxml2-incdir   LIBXML2 include directory
   --with-libxml2-libdir   LIBXML2 library directory
   --with-libunwind-incdir LIBUNWIND include directory
   --with-libunwind-libdir LIBUNWIND 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:
@@ -2212,6 +2219,13 @@ fi;
 #LIBIBERTY_LIB_DIR="/usr/lib";
 
 
+# Check whether --with-default-component or --without-default-component was given.
+if test "${with_default_component+set}" = set; then
+  withval="$with_default_component"
+  DEFAULT_COMPONENT="${withval}";
+else
+  DEFAULT_COMPONENT=`cat autodyninst/default_component`;
+fi;
 
 # Check whether --with-tcl83 or --without-tcl83 was given.
 if test "${with_tcl83+set}" = set; then
@@ -2545,6 +2559,7 @@ fi
 
 
 
+
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -2614,10 +2629,55 @@ if test "${enable_gnu_demangler+set}" = set; then
   GNU_DEMANGLER="true"
 fi;
 
+if test "x$DEFAULT_COMPONENT" = "xInstructionAPI"; then
+   { echo "$as_me:$LINENO: InstructionAPI, not requiring libelf..." >&5
+echo "$as_me: InstructionAPI, not requiring libelf..." >&6;}
+   SUPPRESS_LIBELF_REQ="true"
+   { echo "$as_me:$LINENO: InstructionAPI, not requiring thread_db..." >&5
+echo "$as_me: InstructionAPI, not requiring thread_db..." >&6;}
+   SUPPRESS_THREADDB_REQ="true"
+   { echo "$as_me:$LINENO: InstructionAPI, not requiring libdwarf..." >&5
+echo "$as_me: InstructionAPI, not requiring libdwarf..." >&6;}
+   SUPPRESS_LIBDWARF_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xSymtabAPI"; then
+   { echo "$as_me:$LINENO: SymtabAPI, not requiring thread_db..." >&5
+echo "$as_me: SymtabAPI, not requiring thread_db..." >&6;}
+   SUPPRESS_THREADDB_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xParseAPI"; then
+   { echo "$as_me:$LINENO: ParseAPI, not requiring thread_db..." >&5
+echo "$as_me: ParseAPI, not requiring thread_db..." >&6;}
+   SUPPRESS_THREADDB_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xProcControlAPI"; then
+   { echo "$as_me:$LINENO: ProcControlAPI, not requiring libdwarf..." >&5
+echo "$as_me: ProcControlAPI, not requiring libdwarf..." >&6;}
+   SUPPRESS_LIBDWARF_REQ="true"
+fi
+if test "`echo $host_os | cut -b-5`" = "linux" ; then
+  if test "x$PLATFORM" = "xppc32_bgp_ion"; then
+   { echo "$as_me:$LINENO: BG/P, thread_db required..." >&5
+echo "$as_me: BG/P, thread_db required..." >&6;}
+  elif test "x$PLATFORM" = "xppc32_bgl_ion"; then
+   { echo "$as_me:$LINENO: BG/L, thread_db required..." >&5
+echo "$as_me: BG/L, thread_db required..." >&6;}
+  else
+   { echo "$as_me:$LINENO: Linux, not requiring thread_db..." >&5
+echo "$as_me: Linux, not requiring thread_db..." >&6;}
+   SUPPRESS_THREADDB_REQ="true"
+  fi
+fi
+
+if test "`echo $host_os | cut -b-3`" = "aix" ; then
+   { echo "$as_me:$LINENO: AIX, not requiring thread_db..." >&5
+echo "$as_me: AIX, not requiring thread_db..." >&6;}
+   SUPPRESS_THREADDB_REQ="true"
+fi
+
 if test "`echo $host_os | cut -b-3`" = "aix" ; then
    { echo "$as_me:$LINENO: AIX system, skipping libelf..." >&5
 echo "$as_me: AIX system, skipping libelf..." >&6;}
-
 else
 
 # Check whether --with-libelf-incdir or --without-libelf-incdir was given.
@@ -2632,12 +2692,13 @@ if test "${with_libelf_libdir+set}" = set; then
   LIBELF_LIB_DIR="${withval}";
 fi;
 
-   CXXFLAGS_HOLD=$CXXFLAGS;
-   CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR";
-   CPPFLAGS_HOLD=$CPPFLAGS;
-   CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR";
+   if test "x$SUPPRESS_LIBELF_REQ" = "x"; then
+      CXXFLAGS_HOLD=$CXXFLAGS;
+      CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR";
+      CPPFLAGS_HOLD=$CPPFLAGS;
+      CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR";
 
-   ac_ext=cc
+      ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3264,8 +3325,8 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 echo "$as_me: ELF include directory: $LIBELF_INC_DIR" >&6;}
 else
   CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR/libelf";
-         CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR/libelf";
-         as_ac_Header=`echo "ac_cv_header_$LIBELF_INC_DIR/libelf/libelf.h" | $as_tr_sh`
+            CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR/libelf";
+            as_ac_Header=`echo "ac_cv_header_$LIBELF_INC_DIR/libelf/libelf.h" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo "$as_me:$LINENO: checking for $LIBELF_INC_DIR/libelf/libelf.h" >&5
 echo $ECHO_N "checking for $LIBELF_INC_DIR/libelf/libelf.h... $ECHO_C" >&6
@@ -3416,8 +3477,8 @@ fi
 fi
 
 
-   CXXFLAGS=$CXXFLAGS_HOLD;
-   CPPFLAGS=$CPPFLAGS_HOLD;
+      CXXFLAGS=$CXXFLAGS_HOLD;
+      CPPFLAGS=$CPPFLAGS_HOLD;
 
   if test "$LIBELF_LIB_DIR" = "" ; then
 
@@ -3672,6 +3733,7 @@ fi
   	LIB_TYPE_STATIC=`ls -H -1 $LIBELF_LIB_DIR | grep elf | grep '\.a' | wc | awk '{if($'2' > 0){print "true"} else {print ""}}'`
   fi
 
+   fi
    LIBELF_STATIC="$LIB_TYPE_STATIC"
    LIBELF_DYNAMIC="$LIB_TYPE_DYNAMIC"
 
@@ -3885,7 +3947,6 @@ fi
 if test "`echo $host_os | cut -b-3`" = "aix" ; then
    { echo "$as_me:$LINENO: AIX system, skipping libdwarf..." >&5
 echo "$as_me: AIX system, skipping libdwarf..." >&6;}
-
 else
 
 # Check whether --with-libdwarf-incdir or --without-libdwarf-incdir was given.
@@ -3900,12 +3961,13 @@ if test "${with_libdwarf_libdir+set}" = set; then
   LIBDWARF_LIB_DIR="${withval}";
 fi;
 
-   CXXFLAGS_HOLD=$CXXFLAGS;
-   CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR";
-   CPPFLAGS_HOLD=$CPPFLAGS;
-   CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR";
+   if test "x$SUPPRESS_LIBDWARF_REQ" = "x"; then
+       CXXFLAGS_HOLD=$CXXFLAGS;
+       CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR";
+       CPPFLAGS_HOLD=$CPPFLAGS;
+       CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR";
 
-   as_ac_Header=`echo "ac_cv_header_$LIBDWARF_INC_DIR/libdwarf.h" | $as_tr_sh`
+       as_ac_Header=`echo "ac_cv_header_$LIBDWARF_INC_DIR/libdwarf.h" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo "$as_me:$LINENO: checking for $LIBDWARF_INC_DIR/libdwarf.h" >&5
 echo $ECHO_N "checking for $LIBDWARF_INC_DIR/libdwarf.h... $ECHO_C" >&6
@@ -4048,8 +4110,8 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 echo "$as_me: DWARF include directory: $LIBDWARF_INC_DIR" >&6;}
 else
   CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
-         CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
-         as_ac_Header=`echo "ac_cv_header_$LIBDWARF_INC_DIR/libdwarf/libdwarf.h" | $as_tr_sh`
+                         CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
+                         as_ac_Header=`echo "ac_cv_header_$LIBDWARF_INC_DIR/libdwarf/libdwarf.h" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo "$as_me:$LINENO: checking for $LIBDWARF_INC_DIR/libdwarf/libdwarf.h" >&5
 echo $ECHO_N "checking for $LIBDWARF_INC_DIR/libdwarf/libdwarf.h... $ECHO_C" >&6
@@ -4200,8 +4262,8 @@ fi
 fi
 
 
-   CXXFLAGS=$CXXFLAGS_HOLD;
-   CPPFLAGS=$CPPFLAGS_HOLD;
+       CXXFLAGS=$CXXFLAGS_HOLD;
+       CPPFLAGS=$CPPFLAGS_HOLD;
 
 
   if test "$LIBDWARF_LIB_DIR" = "" ; then
@@ -4457,6 +4519,8 @@ fi
   	LIB_TYPE_STATIC=`ls -H -1 $LIBDWARF_LIB_DIR | grep dwarf | grep '\.a' | wc | awk '{if($'2' > 0){print "true"} else {print ""}}'`
   fi
 
+   fi
+
    LIBDWARF_STATIC="$LIB_TYPE_STATIC"
    LIBDWARF_DYNAMIC="$LIB_TYPE_DYNAMIC"
 
@@ -4686,43 +4750,47 @@ fi
 
 
 
-
-
-# Check whether --with-libxml2-incdir or --without-libxml2-incdir was given.
-if test "${with_libxml2_incdir+set}" = set; then
-  withval="$with_libxml2_incdir"
-  LIBXML2_INC_DIR="${withval}";
+# Check whether --with-threaddb-incdir or --without-threaddb-incdir was given.
+if test "${with_threaddb_incdir+set}" = set; then
+  withval="$with_threaddb_incdir"
+  THREADDB_INC_DIR="${withval}";
 fi;
 
-# Check whether --with-libxml2-libdir or --without-libxml2-libdir was given.
-if test "${with_libxml2_libdir+set}" = set; then
-  withval="$with_libxml2_libdir"
-  LIBXML2_LIB_DIR="${withval}";
+# Check whether --with-threaddb-libdir or --without-threaddb-libdir was given.
+if test "${with_threaddb_libdir+set}" = set; then
+  withval="$with_threaddb_libdir"
+  THREADDB_LIB_DIR="${withval}";
 fi;
-
-  CXXFLAGS_HOLD=$CXXFLAGS
-  if test "$LIBXML2_INC_DIR" != "" ; then
-    echo "$as_me:$LINENO: checking for libxml/xmlschemas.h in $LIBXML2_INC_DIR" >&5
-echo $ECHO_N "checking for libxml/xmlschemas.h in $LIBXML2_INC_DIR... $ECHO_C" >&6
-    CXXFLAGS="$CXXFLAGS -I$LIBXML2_INC_DIR"
-  else
-    echo "$as_me:$LINENO: checking for libxml/xmlschemas.h" >&5
-echo $ECHO_N "checking for libxml/xmlschemas.h... $ECHO_C" >&6
-  fi
-  cat >conftest.$ac_ext <<_ACEOF
+CXXFLAGS_HOLD=$CXXFLAGS;
+CPPFLAGS_HOLD=$CPPFLAGS;
+LDFLAGS_HOLD=$LDFLAGS
+if test "x$THREADDB_INC_DIR" != "x"; then
+  CXXFLAGS="$CXXFLAGS -I$THREADDB_INC_DIR"
+  CPPFLAGS="$CPPFLAGS -I$THREADDB_INC_DIR"
+fi
+LDFLAGS="-shared -fPIC"
+HAVE_THREADDB="true"
+if test "x$SUPPRESS_THREADDB_REQ" = "x"; then
+    if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for thread_db.h" >&5
+echo $ECHO_N "checking for thread_db.h... $ECHO_C" >&6
+if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_thread_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_thread_db_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking thread_db.h usability" >&5
+echo $ECHO_N "checking thread_db.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "libxml/xmlschemas.h"
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+$ac_includes_default
+#include <thread_db.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4746,31 +4814,120 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<\_ACEOF
-#define cap_have_libxml 1
-_ACEOF
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
+# Is the header present?
+echo "$as_me:$LINENO: checking thread_db.h presence" >&5
+echo $ECHO_N "checking thread_db.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <thread_db.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: result: libxml/xmlschemas.h not found in $LIBXML2_INC_DIR" >&5
-echo "${ECHO_T}libxml/xmlschemas.h not found in $LIBXML2_INC_DIR" >&6
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: thread_db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: thread_db.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: thread_db.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: thread_db.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: thread_db.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: thread_db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: thread_db.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: thread_db.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to bugs@dyninst.org ##
+## ------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for thread_db.h" >&5
+echo $ECHO_N "checking for thread_db.h... $ECHO_C" >&6
+if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_thread_db_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_thread_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_thread_db_h" >&6
+
+fi
+if test $ac_cv_header_thread_db_h = yes; then
+  { echo "$as_me:$LINENO: thread_db include directory: $THREADDB_INC_DIR" >&5
+echo "$as_me: thread_db include directory: $THREADDB_INC_DIR" >&6;}
+else
+  { { echo "$as_me:$LINENO: error: couldn't find thread_db.h" >&5
+echo "$as_me: error: couldn't find thread_db.h" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  CXXFLAGS=$CXXFLAGS_HOLD
 
 
-  if test "$LIBXML2_LIB_DIR" = "" ; then
 
-echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
-echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
-if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+  if test "$THREADDB_LIB_DIR" = "" ; then
+
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxml2  $LIBS"
+LIBS="-lthread_db  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4784,11 +4941,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char xmlAddID ();
+char td_ta_new ();
 int
 main ()
 {
-xmlAddID ();
+td_ta_new ();
   ;
   return 0;
 }
@@ -4815,43 +4972,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_xml2_xmlAddID=yes
+  ac_cv_lib_thread_db_td_ta_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_xml2_xmlAddID=no
+ac_cv_lib_thread_db_td_ta_new=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
-echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
-if test $ac_cv_lib_xml2_xmlAddID = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXML2 1
+#define HAVE_LIBTHREAD_DB 1
 _ACEOF
 
-  LIBS="-lxml2 $LIBS"
+  LIBS="-lthread_db $LIBS"
 
 else
-  echo "$as_me:$LINENO: result: Can't find libxml2." >&5
-echo "${ECHO_T}Can't find libxml2." >&6
+  { { echo "$as_me:$LINENO: error: Can't find libthread_db." >&5
+echo "$as_me: error: Can't find libthread_db." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
   else
     LIBS_HOLD=$LIBS
     if test "" != "" ; then
-      LIBS="-L$LIBXML2_LIB_DIR -L"
+      LIBS="-L$THREADDB_LIB_DIR -L"
 
-echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
-echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
-if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxml2  $LIBS"
+LIBS="-lthread_db  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4865,11 +5023,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char xmlAddID ();
+char td_ta_new ();
 int
 main ()
 {
-xmlAddID ();
+td_ta_new ();
   ;
   return 0;
 }
@@ -4896,41 +5054,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_xml2_xmlAddID=yes
+  ac_cv_lib_thread_db_td_ta_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_xml2_xmlAddID=no
+ac_cv_lib_thread_db_td_ta_new=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
-echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
-if test $ac_cv_lib_xml2_xmlAddID = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXML2 1
+#define HAVE_LIBTHREAD_DB 1
 _ACEOF
 
-  LIBS="-lxml2 $LIBS"
+  LIBS="-lthread_db $LIBS"
 
 else
-  echo "$as_me:$LINENO: result: Can't find libxml2 in $LIBXML2_LIB_DIR" >&5
-echo "${ECHO_T}Can't find libxml2 in $LIBXML2_LIB_DIR" >&6
+  { { echo "$as_me:$LINENO: error: Can't find libthread_db in $THREADDB_LIB_DIR" >&5
+echo "$as_me: error: Can't find libthread_db in $THREADDB_LIB_DIR" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     else
-      LIBS="-L$LIBXML2_LIB_DIR"
+      LIBS="-L$THREADDB_LIB_DIR"
 
-echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
-echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
-if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxml2  $LIBS"
+LIBS="-lthread_db  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4944,11 +5103,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char xmlAddID ();
+char td_ta_new ();
 int
 main ()
 {
-xmlAddID ();
+td_ta_new ();
   ;
   return 0;
 }
@@ -4975,79 +5134,57 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_xml2_xmlAddID=yes
+  ac_cv_lib_thread_db_td_ta_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_xml2_xmlAddID=no
+ac_cv_lib_thread_db_td_ta_new=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
-echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
-if test $ac_cv_lib_xml2_xmlAddID = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXML2 1
+#define HAVE_LIBTHREAD_DB 1
 _ACEOF
 
-  LIBS="-lxml2 $LIBS"
+  LIBS="-lthread_db $LIBS"
 
 else
-  echo "$as_me:$LINENO: result: Can't find libxml2 in $LIBXML2_LIB_DIR" >&5
-echo "${ECHO_T}Can't find libxml2 in $LIBXML2_LIB_DIR" >&6
+  { { echo "$as_me:$LINENO: error: Can't find libthread_db in $THREADDB_LIB_DIR" >&5
+echo "$as_me: error: Can't find libthread_db in $THREADDB_LIB_DIR" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     fi
     LIBS=$LIBS_HOLD
   fi
 
-
-
-
-if test "$host_cpu" != "ia64" ; then
-   { echo "$as_me:$LINENO: Not IA-64, skipping libunwind..." >&5
-echo "$as_me: Not IA-64, skipping libunwind..." >&6;}
 else
-
-# Check whether --with-libunwind-incdir or --without-libunwind-incdir was given.
-if test "${with_libunwind_incdir+set}" = set; then
-  withval="$with_libunwind_incdir"
-  LIBUNWIND_INC_DIR="${withval}";
-fi;
-
-# Check whether --with-libunwind-libdir or --without-libunwind-libdir was given.
-if test "${with_libunwind_libdir+set}" = set; then
-  withval="$with_libunwind_libdir"
-  LIBUNWIND_LIB_DIR="${withval}";
-fi;
-
-
-  CXXFLAGS_HOLD=$CXXFLAGS
-  if test "${LIBUNWIND_INC_DIR}" != "" ; then
-    echo "$as_me:$LINENO: checking for libunwind.h in ${LIBUNWIND_INC_DIR}" >&5
-echo $ECHO_N "checking for libunwind.h in ${LIBUNWIND_INC_DIR}... $ECHO_C" >&6
-    CXXFLAGS="$CXXFLAGS -I${LIBUNWIND_INC_DIR}"
-  else
-    echo "$as_me:$LINENO: checking for libunwind.h" >&5
-echo $ECHO_N "checking for libunwind.h... $ECHO_C" >&6
-  fi
-  cat >conftest.$ac_ext <<_ACEOF
+    if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for thread_db.h" >&5
+echo $ECHO_N "checking for thread_db.h... $ECHO_C" >&6
+if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_thread_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_thread_db_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking thread_db.h usability" >&5
+echo $ECHO_N "checking thread_db.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "libunwind.h"
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+$ac_includes_default
+#include <thread_db.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5071,20 +5208,784 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: libunwind.h not found in ${LIBUNWIND_INC_DIR}" >&5
-echo "$as_me: error: libunwind.h not found in ${LIBUNWIND_INC_DIR}" >&2;}
-   { (exit 1); exit 1; }; }
+ac_header_compiler=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  CXXFLAGS=$CXXFLAGS_HOLD
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
+# Is the header present?
+echo "$as_me:$LINENO: checking thread_db.h presence" >&5
+echo $ECHO_N "checking thread_db.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <thread_db.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: thread_db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: thread_db.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: thread_db.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: thread_db.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: thread_db.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: thread_db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: thread_db.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: thread_db.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: thread_db.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to bugs@dyninst.org ##
+## ------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for thread_db.h" >&5
+echo $ECHO_N "checking for thread_db.h... $ECHO_C" >&6
+if test "${ac_cv_header_thread_db_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_thread_db_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_thread_db_h" >&5
+echo "${ECHO_T}$ac_cv_header_thread_db_h" >&6
+
+fi
+if test $ac_cv_header_thread_db_h = yes; then
+  { echo "$as_me:$LINENO: thread_db include directory: $THREADDB_INC_DIR" >&5
+echo "$as_me: thread_db include directory: $THREADDB_INC_DIR" >&6;}
+else
+  HAVE_THREADDB=""
+fi
+
+
+
+  if test "$THREADDB_LIB_DIR" = "" ; then
+
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lthread_db  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char td_ta_new ();
+int
+main ()
+{
+td_ta_new ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_thread_db_td_ta_new=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_thread_db_td_ta_new=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTHREAD_DB 1
+_ACEOF
+
+  LIBS="-lthread_db $LIBS"
+
+else
+  HAVE_THREADDB=""
+fi
+
+  else
+    LIBS_HOLD=$LIBS
+    if test "" != "" ; then
+      LIBS="-L$THREADDB_LIB_DIR -L"
+
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lthread_db  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char td_ta_new ();
+int
+main ()
+{
+td_ta_new ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_thread_db_td_ta_new=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_thread_db_td_ta_new=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTHREAD_DB 1
+_ACEOF
+
+  LIBS="-lthread_db $LIBS"
+
+else
+  HAVE_THREADDB=""
+fi
+
+    else
+      LIBS="-L$THREADDB_LIB_DIR"
+
+echo "$as_me:$LINENO: checking for td_ta_new in -lthread_db" >&5
+echo $ECHO_N "checking for td_ta_new in -lthread_db... $ECHO_C" >&6
+if test "${ac_cv_lib_thread_db_td_ta_new+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lthread_db  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char td_ta_new ();
+int
+main ()
+{
+td_ta_new ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_thread_db_td_ta_new=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_thread_db_td_ta_new=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_thread_db_td_ta_new" >&5
+echo "${ECHO_T}$ac_cv_lib_thread_db_td_ta_new" >&6
+if test $ac_cv_lib_thread_db_td_ta_new = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTHREAD_DB 1
+_ACEOF
+
+  LIBS="-lthread_db $LIBS"
+
+else
+  HAVE_THREADDB=""
+fi
+
+    fi
+    LIBS=$LIBS_HOLD
+  fi
+
+fi
+if test "x$HAVE_THREADDB" = "xtrue"; then
+    exit 22
+
+  LIB_TYPE_DYNAMIC=`ls -H -1 $THREADDB_LIB_DIR | grep thread_db | grep '\.so' | wc | awk '{if($'2' > 0){print "true"} else {print ""}}'`
+  if test "$LIB_TYPE_DYNAMIC" = "true"; then
+	LIB_TYPE_STATIC=
+  else
+  	LIB_TYPE_STATIC=`ls -H -1 $THREADDB_LIB_DIR | grep thread_db | grep '\.a' | wc | awk '{if($'2' > 0){print "true"} else {print ""}}'`
+  fi
+
+fi
+CXXFLAGS=$CXXFLAGS_HOLD
+CPPFLAGS=$CPPFLAGS_HOLD
+LDFLAGS=$LDFLAGS_HOLD
+THREADDB_STATIC="$LIB_TYPE_STATIC"
+THREADDB_DYNAMIC="$LIB_TYPE_DYNAMIC"
+
+
+
+
+
+
+
+# Check whether --with-libxml2-incdir or --without-libxml2-incdir was given.
+if test "${with_libxml2_incdir+set}" = set; then
+  withval="$with_libxml2_incdir"
+  LIBXML2_INC_DIR="${withval}";
+fi;
+
+# Check whether --with-libxml2-libdir or --without-libxml2-libdir was given.
+if test "${with_libxml2_libdir+set}" = set; then
+  withval="$with_libxml2_libdir"
+  LIBXML2_LIB_DIR="${withval}";
+fi;
+
+  CXXFLAGS_HOLD=$CXXFLAGS
+  if test "$LIBXML2_INC_DIR" != "" ; then
+    echo "$as_me:$LINENO: checking for libxml/xmlschemas.h in $LIBXML2_INC_DIR" >&5
+echo $ECHO_N "checking for libxml/xmlschemas.h in $LIBXML2_INC_DIR... $ECHO_C" >&6
+    CXXFLAGS="$CXXFLAGS -I$LIBXML2_INC_DIR"
+  else
+    echo "$as_me:$LINENO: checking for libxml/xmlschemas.h" >&5
+echo $ECHO_N "checking for libxml/xmlschemas.h... $ECHO_C" >&6
+  fi
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "libxml/xmlschemas.h"
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define cap_have_libxml 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: libxml/xmlschemas.h not found in $LIBXML2_INC_DIR" >&5
+echo "${ECHO_T}libxml/xmlschemas.h not found in $LIBXML2_INC_DIR" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  CXXFLAGS=$CXXFLAGS_HOLD
+
+
+  if test "$LIBXML2_LIB_DIR" = "" ; then
+
+echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
+echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
+if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char xmlAddID ();
+int
+main ()
+{
+xmlAddID ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_xml2_xmlAddID=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_xml2_xmlAddID=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
+echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
+if test $ac_cv_lib_xml2_xmlAddID = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXML2 1
+_ACEOF
+
+  LIBS="-lxml2 $LIBS"
+
+else
+  echo "$as_me:$LINENO: result: Can't find libxml2." >&5
+echo "${ECHO_T}Can't find libxml2." >&6
+fi
+
+  else
+    LIBS_HOLD=$LIBS
+    if test "" != "" ; then
+      LIBS="-L$LIBXML2_LIB_DIR -L"
+
+echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
+echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
+if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char xmlAddID ();
+int
+main ()
+{
+xmlAddID ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_xml2_xmlAddID=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_xml2_xmlAddID=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
+echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
+if test $ac_cv_lib_xml2_xmlAddID = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXML2 1
+_ACEOF
+
+  LIBS="-lxml2 $LIBS"
+
+else
+  echo "$as_me:$LINENO: result: Can't find libxml2 in $LIBXML2_LIB_DIR" >&5
+echo "${ECHO_T}Can't find libxml2 in $LIBXML2_LIB_DIR" >&6
+fi
+
+    else
+      LIBS="-L$LIBXML2_LIB_DIR"
+
+echo "$as_me:$LINENO: checking for xmlAddID in -lxml2" >&5
+echo $ECHO_N "checking for xmlAddID in -lxml2... $ECHO_C" >&6
+if test "${ac_cv_lib_xml2_xmlAddID+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char xmlAddID ();
+int
+main ()
+{
+xmlAddID ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_xml2_xmlAddID=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_xml2_xmlAddID=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlAddID" >&5
+echo "${ECHO_T}$ac_cv_lib_xml2_xmlAddID" >&6
+if test $ac_cv_lib_xml2_xmlAddID = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXML2 1
+_ACEOF
+
+  LIBS="-lxml2 $LIBS"
+
+else
+  echo "$as_me:$LINENO: result: Can't find libxml2 in $LIBXML2_LIB_DIR" >&5
+echo "${ECHO_T}Can't find libxml2 in $LIBXML2_LIB_DIR" >&6
+fi
+
+    fi
+    LIBS=$LIBS_HOLD
+  fi
+
+
+
+
+if test "$host_cpu" != "ia64" ; then
+   { echo "$as_me:$LINENO: Not IA-64, skipping libunwind..." >&5
+echo "$as_me: Not IA-64, skipping libunwind..." >&6;}
+else
+
+# Check whether --with-libunwind-incdir or --without-libunwind-incdir was given.
+if test "${with_libunwind_incdir+set}" = set; then
+  withval="$with_libunwind_incdir"
+  LIBUNWIND_INC_DIR="${withval}";
+fi;
+
+# Check whether --with-libunwind-libdir or --without-libunwind-libdir was given.
+if test "${with_libunwind_libdir+set}" = set; then
+  withval="$with_libunwind_libdir"
+  LIBUNWIND_LIB_DIR="${withval}";
+fi;
+
+
+  CXXFLAGS_HOLD=$CXXFLAGS
+  if test "${LIBUNWIND_INC_DIR}" != "" ; then
+    echo "$as_me:$LINENO: checking for libunwind.h in ${LIBUNWIND_INC_DIR}" >&5
+echo $ECHO_N "checking for libunwind.h in ${LIBUNWIND_INC_DIR}... $ECHO_C" >&6
+    CXXFLAGS="$CXXFLAGS -I${LIBUNWIND_INC_DIR}"
+  else
+    echo "$as_me:$LINENO: checking for libunwind.h" >&5
+echo $ECHO_N "checking for libunwind.h... $ECHO_C" >&6
+  fi
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "libunwind.h"
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: libunwind.h not found in ${LIBUNWIND_INC_DIR}" >&5
+echo "$as_me: error: libunwind.h not found in ${LIBUNWIND_INC_DIR}" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  CXXFLAGS=$CXXFLAGS_HOLD
+
+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;
 
 
 
@@ -6176,6 +7077,7 @@ s,@_CXX_@,$_CXX_,;t t
 s,@USE_TCL83@,$USE_TCL83,;t t
 s,@TCLTK_INC_DIR@,$TCLTK_INC_DIR,;t t
 s,@TCLTK_LIB_DIR@,$TCLTK_LIB_DIR,;t t
+s,@DEFAULT_COMPONENT@,$DEFAULT_COMPONENT,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t
@@ -6201,10 +7103,17 @@ s,@LIBDWARF_LIB_DIR@,$LIBDWARF_LIB_DIR,;t t
 s,@LIBDWARF_STATIC@,$LIBDWARF_STATIC,;t t
 s,@LIBDWARF_DYNAMIC@,$LIBDWARF_DYNAMIC,;t t
 s,@LIBDWARF_HAS_SET_FRAME@,$LIBDWARF_HAS_SET_FRAME,;t t
+s,@THREADDB_INC_DIR@,$THREADDB_INC_DIR,;t t
+s,@THREADDB_LIB_DIR@,$THREADDB_LIB_DIR,;t t
+s,@THREADDB_STATIC@,$THREADDB_STATIC,;t t
+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,@LIBUNWIND_INC_DIR@,$LIBUNWIND_INC_DIR,;t t
 s,@LIBUNWIND_LIB_DIR@,$LIBUNWIND_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 4047ea0..a3380b1 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,10 @@ AC_ARG_WITH(package-base,
 #          Why?  Putting these here for now...
 #LIBIBERTY_LIB_DIR="/usr/lib";
 
-
+AC_ARG_WITH(default-component,
+            [AS_HELP_STRING([--with-default-component],[Valid values: DyninstAPI, SymtabAPI, InstructionAPI, ProcControlAPI, ParseAPI, default])],
+            [DEFAULT_COMPONENT="${withval}";],
+            [DEFAULT_COMPONENT=`cat autodyninst/default_component`;])                                                            
 AC_ARG_WITH(tcl83,
             [AS_HELP_STRING([--with-tcl83],[Use Tcl/Tk 8.3])],
             [TCL_VERSION="tcl8.3"; USE_TCL83="${withval}";],
@@ -74,6 +77,7 @@ PD_SOFT_CHECK_LIB_DIR($TCLTK_LIB_DIR, $TCL_VERSION, [Tcl_Eval])
 AC_SUBST(USE_TCL83)
 AC_SUBST(TCLTK_INC_DIR)
 AC_SUBST(TCLTK_LIB_DIR)
+AC_SUBST(DEFAULT_COMPONENT)
 
 AC_CANONICAL_HOST
 
@@ -86,9 +90,44 @@ AC_ARG_ENABLE(gnu-demangler,
               [AS_HELP_STRING([--enable-gnu-demangler],[Use g++'s built in demangler])],
               [GNU_DEMANGLER="true"],)
 
+if test "x$DEFAULT_COMPONENT" = "xInstructionAPI"; then
+   AC_MSG_NOTICE([InstructionAPI, not requiring libelf...])   
+   SUPPRESS_LIBELF_REQ="true"
+   AC_MSG_NOTICE([InstructionAPI, not requiring thread_db...])   
+   SUPPRESS_THREADDB_REQ="true"
+   AC_MSG_NOTICE([InstructionAPI, not requiring libdwarf...])   
+   SUPPRESS_LIBDWARF_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xSymtabAPI"; then
+   AC_MSG_NOTICE([SymtabAPI, not requiring thread_db...])
+   SUPPRESS_THREADDB_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xParseAPI"; then
+   AC_MSG_NOTICE([ParseAPI, not requiring thread_db...])
+   SUPPRESS_THREADDB_REQ="true"
+fi
+if test "x$DEFAULT_COMPONENT" = "xProcControlAPI"; then
+   AC_MSG_NOTICE([ProcControlAPI, not requiring libdwarf...])   
+   SUPPRESS_LIBDWARF_REQ="true"
+fi 
+if test "`echo $host_os | cut -b-5`" = "linux" ; then
+  if test "x$PLATFORM" = "xppc32_bgp_ion"; then
+   AC_MSG_NOTICE([BG/P, thread_db required...])   
+  elif test "x$PLATFORM" = "xppc32_bgl_ion"; then
+   AC_MSG_NOTICE([BG/L, thread_db required...])
+  else 
+   AC_MSG_NOTICE([Linux, not requiring thread_db...])
+   SUPPRESS_THREADDB_REQ="true"
+  fi
+fi
+
+if test "`echo $host_os | cut -b-3`" = "aix" ; then
+   AC_MSG_NOTICE([AIX, not requiring thread_db...])
+   SUPPRESS_THREADDB_REQ="true"
+fi
+
 if test "`echo $host_os | cut -b-3`" = "aix" ; then
    AC_MSG_NOTICE([AIX system, skipping libelf...])
-   
 else
    AC_ARG_WITH(libelf-incdir,
 		   [AS_HELP_STRING([--with-libelf-incdir],[LIBELF include directory])],
@@ -97,21 +136,23 @@ else
             [AS_HELP_STRING([--with-libelf-libdir],[LIBELF library directory])],
             [LIBELF_LIB_DIR="${withval}";],)
   
-   CXXFLAGS_HOLD=$CXXFLAGS;
-   CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR";
-   CPPFLAGS_HOLD=$CPPFLAGS;
-   CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR";
-                        
-   AC_CHECK_HEADER([$LIBELF_INC_DIR/libelf.h], [AC_MSG_NOTICE(ELF include directory: $LIBELF_INC_DIR)],
-        [CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR/libelf";
-         CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR/libelf";
-         AC_CHECK_HEADER([$LIBELF_INC_DIR/libelf/libelf.h],
-                         [LIBELF_INC_DIR+="/libelf";AC_MSG_NOTICE(ELF include directory: $LIBELF_INC_DIR)],
-                         [AC_ERROR(couldn't find libelf.h)])])
-   CXXFLAGS=$CXXFLAGS_HOLD;
-   CPPFLAGS=$CPPFLAGS_HOLD;
-   PD_CHECK_LIB_DIR($LIBELF_LIB_DIR,[elf],[elf_memory])
-   PD_CHECK_LIB_TYPE($LIBELF_LIB_DIR, elf)
+   if test "x$SUPPRESS_LIBELF_REQ" = "x"; then
+      CXXFLAGS_HOLD=$CXXFLAGS;
+      CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR";
+      CPPFLAGS_HOLD=$CPPFLAGS;
+      CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR";
+
+      AC_CHECK_HEADER([$LIBELF_INC_DIR/libelf.h], [AC_MSG_NOTICE(ELF include directory: $LIBELF_INC_DIR)],
+           [CXXFLAGS="$CXXFLAGS -I$LIBELF_INC_DIR/libelf";
+            CPPFLAGS="$CPPFLAGS -I$LIBELF_INC_DIR/libelf";
+            AC_CHECK_HEADER([$LIBELF_INC_DIR/libelf/libelf.h],
+                            [LIBELF_INC_DIR+="/libelf";AC_MSG_NOTICE(ELF include directory: $LIBELF_INC_DIR)],
+                            [AC_ERROR(couldn't find libelf.h)])])
+      CXXFLAGS=$CXXFLAGS_HOLD;
+      CPPFLAGS=$CPPFLAGS_HOLD;
+      PD_CHECK_LIB_DIR($LIBELF_LIB_DIR,[elf],[elf_memory])
+      PD_CHECK_LIB_TYPE($LIBELF_LIB_DIR, elf)
+   fi
    LIBELF_STATIC="$LIB_TYPE_STATIC"
    LIBELF_DYNAMIC="$LIB_TYPE_DYNAMIC"
    AC_SUBST(LIBELF_INC_DIR)
@@ -199,10 +240,9 @@ AC_SUBST(GNU_DEMANGLER)
 AC_SUBST(USE_LIBERTY)
 AC_SUBST(LINK_LIBERTY)
 AC_SUBST(LIBIBERTY_LIB_DIR)
- 
+
 if test "`echo $host_os | cut -b-3`" = "aix" ; then
    AC_MSG_NOTICE([AIX system, skipping libdwarf...])
-   
 else
    AC_ARG_WITH(libdwarf-incdir,
             [AS_HELP_STRING([--with-libdwarf-incdir],[LIBDWARF include directory])],
@@ -211,22 +251,25 @@ else
             [AS_HELP_STRING([--with-libdwarf-libdir],[LIBDWARF library directory])],
             [LIBDWARF_LIB_DIR="${withval}";],)
    
-   CXXFLAGS_HOLD=$CXXFLAGS;
-   CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR";
-   CPPFLAGS_HOLD=$CPPFLAGS;
-   CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR";
-                        
-   AC_CHECK_HEADER([$LIBDWARF_INC_DIR/libdwarf.h], [AC_MSG_NOTICE(DWARF include directory: $LIBDWARF_INC_DIR)],
-        [CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
-         CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
-         AC_CHECK_HEADER([$LIBDWARF_INC_DIR/libdwarf/libdwarf.h],
-                         [LIBDWARF_INC_DIR+="/libdwarf";AC_MSG_NOTICE(DWARF include directory: $LIBDWARF_INC_DIR)],
-                         [AC_ERROR(couldn't find libdwarf.h)])])
-   CXXFLAGS=$CXXFLAGS_HOLD;
-   CPPFLAGS=$CPPFLAGS_HOLD;
-
-   PD_CHECK_LIB_DIR($LIBDWARF_LIB_DIR,[dwarf],[dwarf_add_arange],$LIBELF_LIB_DIR,[-lelf])
-   PD_CHECK_LIB_TYPE($LIBDWARF_LIB_DIR, dwarf)
+   if test "x$SUPPRESS_LIBDWARF_REQ" = "x"; then                        
+       CXXFLAGS_HOLD=$CXXFLAGS;
+       CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR";
+       CPPFLAGS_HOLD=$CPPFLAGS;
+       CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR";
+
+       AC_CHECK_HEADER([$LIBDWARF_INC_DIR/libdwarf.h], [AC_MSG_NOTICE(DWARF include directory: $LIBDWARF_INC_DIR)],
+                        [CXXFLAGS="$CXXFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
+                         CPPFLAGS="$CPPFLAGS -I$LIBDWARF_INC_DIR/libdwarf";
+                         AC_CHECK_HEADER([$LIBDWARF_INC_DIR/libdwarf/libdwarf.h],
+                              [LIBDWARF_INC_DIR+="/libdwarf";AC_MSG_NOTICE(DWARF include directory: $LIBDWARF_INC_DIR)],
+                              [AC_ERROR(couldn't find libdwarf.h)])])
+       CXXFLAGS=$CXXFLAGS_HOLD;
+       CPPFLAGS=$CPPFLAGS_HOLD;
+
+       PD_CHECK_LIB_DIR($LIBDWARF_LIB_DIR,[dwarf],[dwarf_add_arange],$LIBELF_LIB_DIR,[-lelf])
+       PD_CHECK_LIB_TYPE($LIBDWARF_LIB_DIR, dwarf)
+   fi
+
    LIBDWARF_STATIC="$LIB_TYPE_STATIC"
    LIBDWARF_DYNAMIC="$LIB_TYPE_DYNAMIC"
    AC_SUBST(LIBDWARF_INC_DIR)
@@ -240,7 +283,43 @@ else
 fi
 
 
-
+AC_ARG_WITH(threaddb-incdir,
+         [AS_HELP_STRING([--with-threaddb-incdir],[THREADDB include directory])],
+         [THREADDB_INC_DIR="${withval}";],)
+AC_ARG_WITH(threaddb-libdir,
+         [AS_HELP_STRING([--with-threaddb-libdir],[THREADDB library directory])],
+         [THREADDB_LIB_DIR="${withval}";],)
+CXXFLAGS_HOLD=$CXXFLAGS;
+CPPFLAGS_HOLD=$CPPFLAGS;
+LDFLAGS_HOLD=$LDFLAGS
+if test "x$THREADDB_INC_DIR" != "x"; then
+  CXXFLAGS="$CXXFLAGS -I$THREADDB_INC_DIR"
+  CPPFLAGS="$CPPFLAGS -I$THREADDB_INC_DIR"
+fi
+LDFLAGS="-shared -fPIC"
+HAVE_THREADDB="true"
+if test "x$SUPPRESS_THREADDB_REQ" = "x"; then
+    AC_CHECK_HEADER([thread_db.h], [AC_MSG_NOTICE(thread_db include directory: $THREADDB_INC_DIR)],
+                     [AC_ERROR(couldn't find thread_db.h)], )
+    PD_CHECK_LIB_DIR($THREADDB_LIB_DIR,[thread_db],[td_ta_new], , )
+else
+    AC_CHECK_HEADER([thread_db.h], [AC_MSG_NOTICE(thread_db include directory: $THREADDB_INC_DIR)],
+                     [HAVE_THREADDB=""], )
+    PD_CHECK_LIB_DIR_WERR($THREADDB_LIB_DIR,[thread_db],[td_ta_new], , , [HAVE_THREADDB=""])
+fi
+if test "x$HAVE_THREADDB" = "xtrue"; then
+    PD_CHECK_LIB_TYPE($THREADDB_LIB_DIR, thread_db)
+fi
+CXXFLAGS=$CXXFLAGS_HOLD
+CPPFLAGS=$CPPFLAGS_HOLD
+LDFLAGS=$LDFLAGS_HOLD
+THREADDB_STATIC="$LIB_TYPE_STATIC"
+THREADDB_DYNAMIC="$LIB_TYPE_DYNAMIC"
+AC_SUBST(THREADDB_INC_DIR)
+AC_SUBST(THREADDB_LIB_DIR)
+AC_SUBST(THREADDB_STATIC)
+AC_SUBST(THREADDB_DYNAMIC)
+AC_SUBST(HAVE_THREADDB)
 
 AC_ARG_WITH(libxml2-incdir,
             [AS_HELP_STRING([--with-libxml2-incdir],[LIBXML2 include directory])],
@@ -268,6 +347,15 @@ fi
 AC_SUBST(LIBUNWIND_INC_DIR)
 AC_SUBST(LIBUNWIND_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}";],)
diff --git a/make.config b/make.config
index 27aa2cf..e335fa3 100644
--- a/make.config
+++ b/make.config
@@ -5,7 +5,66 @@
 #
 
 SUITE_NAME	= Paradyn
-RELEASE_NUM	= 6.0
+RELEASE_NUM	= 6.2
+
+Everything = dynutil common symtabAPI instructionAPI parseAPI proccontrol stackwalk dyninstAPI_RT dyninstAPI 
+SymtabAPI 	= dynutil common symtabAPI
+StackwalkerAPI = dynutil common symtabAPI stackwalk
+DyninstAPI	= dynutil common symtabAPI instructionAPI parseAPI dyninstAPI_RT dyninstAPI
+InstructionAPI	= dynutil common instructionAPI
+ProcControlAPI = dynutil common proccontrol
+DepGraphAPI = depGraphAPI
+ParseAPI = dynutil common symtabAPI instructionAPI parseAPI
+ValueAdded = valueAdded/sharedMem
+DataflowAPI = ParseAPI
+
+DEFAULT_COMPONENT ?= default
+ifeq ($(DEFAULT_COMPONENT),default)
+fullSystem	+= $(Everything)
+BUILD_PARSETHAT = true
+else
+ifeq ($(DEFAULT_COMPONENT),SymtabAPI)
+fullSystem += $(SymtabAPI)
+else
+ifeq ($(DEFAULT_COMPONENT),StackwalkerAPI)
+fullSystem += $(StackwalkerAPI)
+else
+ifeq ($(DEFAULT_COMPONENT),DyninstAPI)
+fullSystem	+= $(DyninstAPI)
+BUILD_PARSETHAT = true
+else
+ifeq ($(DEFAULT_COMPONENT),InstructionAPI)
+fullSystem += $(InstructionAPI)
+else
+ifeq ($(DEFAULT_COMPONENT),ProcControlAPI)
+fullSystem += $(ProcControlAPI)
+else
+ifeq ($(DEFAULT_COMPONENT),ParseAPI)
+fullSystem += $(ParseAPI)
+else
+ifeq ($(DEFAULT_COMPONENT),DataflowAPI)
+fullSystem += $(ParseAPI)
+else
+default:
+	@echo Error: Build system does not have a valid default component: $(DEFAULT_COMPONENT)
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+
+ifndef DONT_BUILD_NEWTESTSUITE
+testsuites += testsuite
+allSubdirs_noinstall += testsuite 
+fullSystem += testsuite
+ifdef BUILD_PARSETHAT
+testsuites += parseThat
+fullSystem += parseThat
+endif
+endif
 
 #BUILD_MARK	=
 EXPLICIT_DEPENDS = 1
@@ -20,7 +79,6 @@ EXPLICIT_DEPENDS = 1
 ifndef TO_CORE
 TO_CORE		= ../..
 endif
-TO_CORE_ABS = $(shell pwd)/$(TO_CORE)
 ifndef TO_SCRIPTS
 TO_SCRIPTS = $(TO_CORE)/../scripts
 endif
@@ -83,9 +141,9 @@ include $(TO_CORE)/make.config.local
 
 # Destinations for library and executable installation (relative to "dyninst"!)
 # Warning: modification of the build/install structure is not recommended!
-LIBRARY_DEST	?= ${TO_CORE_ABS}/../${PLATFORM}/lib
-PROGRAM_DEST	?= ${TO_CORE_ABS}/../${PLATFORM}/bin
-INCLUDE_DEST   ?= ${TO_CORE_ABS}/../include
+LIBRARY_DEST	?= ${TO_CORE}/../${PLATFORM}/lib
+PROGRAM_DEST	?= ${TO_CORE}/../${PLATFORM}/bin
+INCLUDE_DEST   ?= ${TO_CORE}/../include
 
 # Usually, we look for files, binaries, libs in $(TO_CORE)/....<something>.
 # But if the file doesn't exist there (i.e. if the user hasn't checked them out
@@ -249,7 +307,7 @@ ifeq ($(PLATFORM),ppc32_linux)
 OLD_DEF     = -Dppc32_linux
 ARCH_DEF    = -Darch_power
 OS_DEF      = -Dos_linux
-CAP_DEF     = -Dcap_ptrace -Dcap_mutatee_traps -Dcap_relocation -Dcap_async_events -Dcap_threads -Dcap_dynamic_heap -Dcap_dwarf -Dcap_liveness \
+CAP_DEF     = -Dcap_ptrace -Dcap_relocation -Dcap_async_events -Dcap_threads -Dcap_dynamic_heap -Dcap_dwarf -Dcap_liveness \
 -Dcap_serialization -Dcap_registers -Dcap_instruction_replacement -Dcap_instruction_api \
 -Dcap_binary_rewriter
 BUG_DEF     = -Dbug_syscall_changepc_rewind
@@ -331,6 +389,10 @@ BUG_DEF     = -Dbug_freebsd_missing_sigstop -Dbug_freebsd_mt_suspend -Dbug_freeb
 endif
 
 
+ifdef HAVE_THREAD_DB
+CAP_DEF    += -Dcap_thread_db
+endif
+
 # Combine all the #defines for ease of use
 UNIFIED_DEF	= $(ARCH_DEF) $(OS_DEF) $(VER_DEF) $(CAP_DEF) $(BUG_DEF) $(OLD_DEF) $(AC_DEF)
 UNIFIED_TEST_DEF	= $(ARCH_DEF) $(OS_DEF) $(VER_DEF) $(CAP_DEF) $(BUG_DEF) $(OLD_DEF)
diff --git a/make.library.tmpl b/make.library.tmpl
index ddcde89..b99c019 100644
--- a/make.library.tmpl
+++ b/make.library.tmpl
@@ -131,13 +131,8 @@ clean:
 distclean: clean
 	$(RM) DEPENDS
 
-RELEASE_MAJOR ?= $(RELEASE_NUM)
-RELEASE_NUM = $(RELEASE_MAJOR).$(RELEASE_MINOR)
-
 $(DEST)/$(TARGET): $(TARGET)
-	-$(CP) $(TARGET) $(DEST)/$(TARGET).$(RELEASE_NUM)
-	-cd $(DEST); $(LN) -f $(TARGET).$(RELEASE_NUM) $(TARGET).$(RELEASE_MAJOR)
-	-cd $(DEST); $(LN) -f $(TARGET).$(RELEASE_MAJOR) $(TARGET)
+	-$(CP) $(TARGET) $(DEST)
 
 ifdef STATIC_TARGET
 $(DEST)/$(STATIC_TARGET): $(STATIC_TARGET)
diff --git a/testsuite/amd64-unknown-freebsd7.2/Makefile b/testsuite/amd64-unknown-freebsd7.2/Makefile
index e15ec3e..c9f30a9 100644
--- a/testsuite/amd64-unknown-freebsd7.2/Makefile
+++ b/testsuite/amd64-unknown-freebsd7.2/Makefile
@@ -12,6 +12,7 @@ DEBUG_FLAG = -g
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/i386-unknown-freebsd7.2/Makefile b/testsuite/i386-unknown-freebsd7.2/Makefile
index d92f14a..ca04f22 100644
--- a/testsuite/i386-unknown-freebsd7.2/Makefile
+++ b/testsuite/i386-unknown-freebsd7.2/Makefile
@@ -12,6 +12,7 @@ DEBUG_FLAG = -g
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/i386-unknown-linux2.4/Makefile b/testsuite/i386-unknown-linux2.4/Makefile
index 2f01fd8..b4cf93a 100644
--- a/testsuite/i386-unknown-linux2.4/Makefile
+++ b/testsuite/i386-unknown-linux2.4/Makefile
@@ -12,6 +12,7 @@ DEBUG_FLAG = -g
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/ppc32_linux/Makefile b/testsuite/ppc32_linux/Makefile
index f295443..9e87c66 100644
--- a/testsuite/ppc32_linux/Makefile
+++ b/testsuite/ppc32_linux/Makefile
@@ -12,6 +12,7 @@ DEBUG_FLAG = -g
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/ppc64_linux/Makefile b/testsuite/ppc64_linux/Makefile
index 2523230..28f18c6 100644
--- a/testsuite/ppc64_linux/Makefile
+++ b/testsuite/ppc64_linux/Makefile
@@ -15,6 +15,7 @@ TESTSUITE_FLAGS=$(LDFLAGS)
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/rs6000-ibm-aix5.1/Makefile b/testsuite/rs6000-ibm-aix5.1/Makefile
index 907d00e..7cb5753 100644
--- a/testsuite/rs6000-ibm-aix5.1/Makefile
+++ b/testsuite/rs6000-ibm-aix5.1/Makefile
@@ -10,6 +10,7 @@ INSTANTIATE_TEMPLATES = true
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
 
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/sparc-sun-solaris2.8/Makefile b/testsuite/sparc-sun-solaris2.8/Makefile
index 8dae40a..2440595 100644
--- a/testsuite/sparc-sun-solaris2.8/Makefile
+++ b/testsuite/sparc-sun-solaris2.8/Makefile
@@ -17,6 +17,7 @@ NATIVE_DEBUG_FLAG = -g -xs
 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
diff --git a/testsuite/x86_64-unknown-linux2.4/Makefile b/testsuite/x86_64-unknown-linux2.4/Makefile
index a58f63e..6cfd9d0 100644
--- a/testsuite/x86_64-unknown-linux2.4/Makefile
+++ b/testsuite/x86_64-unknown-linux2.4/Makefile
@@ -15,6 +15,7 @@ CXX = g++
 PLATFORM_CXXFLAGS = 
 # Include standard make configuration stuff that applies to everything
 # in the paradyn tree.
+include $(TO_CORE)/make.config.local
 include $(TO_CORE)/make.config 
 
 # Now make any necessary architecture specific changes to variables:
-- 
1.8.3.1