From 29b694a70f0720649c3335a6efe23613d6ef8d79 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Wed, 23 Sep 2009 15:37:37 -0500
Subject: Fix configure on systems without 'gcc -fgnu89-inline' support
 (rhel4). * configure.ac: Only compile elfutils with '-fgnu89-inline' if the  
 compiler actually supports it. * configure: Regenerated.

---
 configure.ac | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fa3a09bb..6136b48d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -543,6 +543,19 @@ if test $build_elfutils = yes; then
   *) elfutils_srcdir="../$with_elfutils" ;;
   esac
   AC_MSG_NOTICE([running ${elfutils_srcdir}/configure])
+
+  save_CFLAGS="$CFLAGS"
+  save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAGS -fgnu89-inline"
+  CFLAGS="$CFLAGS -fgnu89-inline"
+  gnu89_inline_flag=""
+  AC_COMPILE_IFELSE([int something ();], [
+    AC_MSG_NOTICE([Compiling elfutils with gcc -fgnu89-inline])
+    gnu89_inline_flag="-fgnu89-inline"],[
+    AC_MSG_NOTICE([Compiler does not support -fgnu89-inline])])
+  CFLAGS="$save_CFLAGS"
+  CXXFLAGS="$save_CXXFLAGS"
+
   # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that
   # $ORIGIN is where libdw.so resides, which is not where there is a ../lib.
   # Note that $libdir might be using a quoted use of $exec_prefix or $prefix.
@@ -555,7 +568,7 @@ if test $build_elfutils = yes; then
 				--libdir="${here}/lib-elfutils" \
 				--exec-prefix="$exec_prefix" \
 				--prefix="$prefix" \
-				CFLAGS="${CFLAGS/-Wall/} -fgnu89-inline" \
+				CFLAGS="${CFLAGS/-Wall/} $gnu89_inline_flag" \
 				LDFLAGS="$LDFLAGS $elfutils_rpath" &&
    if test -f ${elfutils_srcdir}/config/version.h.in; then
         echo Trying to install elfutils version header...
-- 
cgit 


From c3f070d9ef42f9b8ceea7ddb9c69496872f7f44c Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Wed, 23 Sep 2009 16:14:46 -0500
Subject: Better grapher option handling. * configure.ac: Don't check for gtkmm
 if '--disable-grapher' was used.   Also, error if '--enable-grapher' was used
 but gtkmm isn't installed. * configure: Regenerated.

---
 configure.ac | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 6136b48d..5d2a010d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,9 +274,18 @@ dnl Handle the optional grapher
 AC_ARG_ENABLE([grapher],
   AS_HELP_STRING([--enable-grapher],
     [enable building of grapher (default on if gtkmm is found).]),
-  [enable_grapher=$enableval],
-  [enable_grapher="check"])
-PKG_CHECK_MODULES([GRAPHER], [gtkmm-2.4 >= 2.8.0],have_gtkmm=yes,have_gtkmm=no)
+  [],					dnl ACTION-IF-GIVEN
+  [enable_grapher="check"])		dnl ACTION-IF-NOT-GIVEN
+dnl If the user didn't disable the grapher, check for gtkmm.
+AS_IF([test "x$enable_grapher" != xno],
+  [PKG_CHECK_MODULES([gtkmm], [gtkmm-2.4 >= 2.8.0],
+   have_gtkmm="yes", have_gtkmm="no")])
+dnl If the user explicitly said to enable the grapher, but we can't
+dnl (since gtkmm isn't installed), error.
+AS_IF([test "x${have_gtkmm}" == "xno" -a x"$enable_grapher" == "xyes"],
+  AC_MSG_ERROR([systemtap cannot find required gtkmm-2.4 libs (gtkmm24-devel may need to be installed)]))
+dnl If the user didn't say to disable the grapher, and gtkmm is
+dnl installed, enable the grapher.
 AM_CONDITIONAL([BUILD_GRAPHER], [test "x${have_gtkmm}" == "xyes" -a x"$enable_grapher" != "xno"])
 
 
-- 
cgit