From eab44db5f19c8b7e67f05a39cd1ad750a215f8e8 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Wed, 31 Oct 2012 21:27:50 -0400
Subject: [PATCH] PR14794: enable --with-dyninst by default, if
 libraries/headers exist

* configure.ac (--with-dyninst): Search for headers/libraries, unless
  --without-dyninst.
---
 configure    | 10 +++++-----
 configure.ac |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 380590df1..cd187435f 100755
--- a/configure
+++ b/configure
@@ -10495,9 +10495,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Check whether --with-dyninst was given.
 if test "${with_dyninst+set}" = set; then :
   withval=$with_dyninst;
+fi
+
+
 case "$with_dyninst" in
-''|no) ;;
-yes) # Try a simple-minded distro search
+no) ;;
+''|yes) # Try a simple-minded distro search
      DYNINST_CXXFLAGS="-I/usr/include/dyninst"
      DYNINST_LDFLAGS="-L/usr/lib64/dyninst -L/usr/lib/dyninst" # XXX both lib paths!?!
      ;;
@@ -10544,9 +10547,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-
-fi
-
  if test "${have_dyninst}" = "yes"; then
   HAVE_DYNINST_TRUE=
   HAVE_DYNINST_FALSE='#'
diff --git a/configure.ac b/configure.ac
index ee99ea20e..bcc3434a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,11 +479,11 @@ AC_LANG_POP(C++)
 # Check for Dyninst headers and libraries
 AC_ARG_WITH([dyninst],
   AS_HELP_STRING([--with-dyninst=DIRECTORY],
-    [find dyninst headers/libraries in DIRECTORY]),
-  [
+    [find dyninst headers/libraries in DIRECTORY]))
+
 case "$with_dyninst" in
-''|no) ;;
-yes) # Try a simple-minded distro search
+no) ;;
+''|yes) # Try a simple-minded distro search
      DYNINST_CXXFLAGS="-I/usr/include/dyninst"
      DYNINST_LDFLAGS="-L/usr/lib64/dyninst -L/usr/lib/dyninst" # XXX both lib paths!?!
      ;;
@@ -506,7 +506,6 @@ if test -n "$DYNINST_CXXFLAGS"; then
   CPPFLAGS="$old_CPPFLAGS"
   AC_LANG_POP(C++)
 fi
-])
 AM_CONDITIONAL([HAVE_DYNINST], [test "${have_dyninst}" = "yes"])
 
 
-- 
2.43.5