2008-01-25 David Smith <dsmith@redhat.com>

	* configure: Correctly regenerated.

diff --git a/configure b/configure
index b9cfb80a27417a70f515349459dee3d2556f57d2..dff7790113af7a2ccd83f704de58657ec345b37f 100755 (executable)
--- a/configure
+++ b/configure
@@ -5828,13 +5828,12 @@ fi
 # Check whether --enable-perfmon was given.
 if test "${enable_perfmon+set}" = set; then
   enableval=$enable_perfmon;
-
-  CFLAGS="$CFLAGS -DPERFMON"
+    CFLAGS="$CFLAGS -DPERFMON"
   CXXFLAGS="$CXXFLAGS -DPERFMON"
   LIBS="$LIBS -lpfm"
     if test "$enable_perfmon" != "yes"; then
-    CFLAGS="$CFLAGS -DPERFMON -I$enable_perfmon/include"
-    CXXFLAGS="$CXXFLAGS -DPERFMON -I$enable_perfmon/include"
+    CFLAGS="$CFLAGS -I$enable_perfmon/include"
+    CXXFLAGS="$CXXFLAGS -I$enable_perfmon/include"
     LDFLAGS="$LDFLAGS -L$enable_perfmon/lib"
   fi
 
@@ -5917,26 +5916,6 @@ fi
 fi
 
 
-#AC_ARG_WITH([perfmon],
-#  AS_HELP_STRING([--with-perfmon=DIRECTORY],
-#    [Path to Perfmon installation to use]),
-#  [
-#case "$with_perfmon" in
-#yes ) AC_MSG_ERROR([--with-perfmon requires an argument]) ;;
-#''|no) ;;
-#*) perfmon_support=yes ;;
-#esac])
-
-
-#if test $perfmon_support = yes; then
-#  AC_CHECK_LIB(pfm, pfm_start,,[
-#    AC_MSG_ERROR([systemtap cannot find required perfmon libs])])
-#  CFLAGS="$CFLAGS -DPERFMON -I$with_perfmon/include"
-#  CXXFLAGS="$CXXFLAGS -DPERFMON -I$with_perfmon/include"
-#  LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib -lpfm"
-#fi
-
-
 if test "${enable_prologues+set}" != set; then
   { echo "$as_me:$LINENO: checking to see if prologue searching should be the default" >&5
 echo $ECHO_N "checking to see if prologue searching should be the default... $ECHO_C" >&6; }