PR13072: fix for translator, add for runtime

* configure.ac, runtime/staprun/configure.ac: Disable enable_sdt_probes
  for gcc < 4.0.

diff --git a/configure b/configure
index 5b51c75da7ccf3cb872d996a916620f1bd474edc..bf527733c924f79fe872b8221ac40af2477b2caa 100755 (executable)
--- a/configure
+++ b/configure
@@ -8694,7 +8694,7 @@ $as_echo_n "checking to see if sdt probes should be the default... " >&6; }
   if { echo '#if __GNUC__ < 4'
        echo ' yes '
        echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-    enable_prologues=no
+    enable_sdt_probes=no
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   else

diff --git a/configure.ac b/configure.ac
index 98f63e452576d581ea1ae32b7e8908ec1fa41d3d..ce3121e4fc88d5977d4f1d77f15d9ccbb99a01a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ if test "${enable_sdt_probes+set}" != set; then
   if { echo '#if __GNUC__ < 4'
        echo ' yes '
        echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-    enable_prologues=no
+    enable_sdt_probes=no
     AC_MSG_RESULT([no])
   else
     AC_MSG_RESULT([yes])

diff --git a/runtime/staprun/aclocal.m4 b/runtime/staprun/aclocal.m4
index a2aed969d6acc51ff6b72e355bff20761cf0d1b6..871a8696bfb64bb04a2e64bdc8f300ab6648053a 100644 (file)
--- a/runtime/staprun/aclocal.m4
+++ b/runtime/staprun/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])

diff --git a/runtime/staprun/configure b/runtime/staprun/configure
index 6d9c50706f0a0f790886e87e4f44799e1776a678..18f9d72ae26f6233b5f5d005fd8a03f782cd3754 100755 (executable)
--- a/runtime/staprun/configure
+++ b/runtime/staprun/configure
@@ -5090,6 +5090,20 @@ fi
 LOCALEDIR="$localedir"
 
 
+if test "${enable_sdt_probes+set}" != set; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if sdt probes should be the default" >&5
+$as_echo_n "checking to see if sdt probes should be the default... " >&6; }
+  if { echo '#if __GNUC__ < 4'
+       echo ' yes '
+       echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+    enable_sdt_probes=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  fi
+fi
 # Check whether --enable-sdt-probes was given.
 if test "${enable_sdt_probes+set}" = set; then :
   enableval=$enable_sdt_probes;

diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
index f449411ca6e2b4c59c89818e8aed96175e491da4..8fd1b4216071aa8e08376277f4f77728bf15ccb7 100644 (file)
--- a/runtime/staprun/configure.ac
+++ b/runtime/staprun/configure.ac
@@ -48,6 +48,17 @@ AC_SUBST(PIECXXFLAGS)
 AC_SUBST(PIELDFLAGS)
 AC_SUBST(LOCALEDIR, "$localedir")
 
+if test "${enable_sdt_probes+set}" != set; then
+  AC_MSG_CHECKING([to see if sdt probes should be the default])
+  if { echo '#if __GNUC__ < 4'
+       echo ' yes '
+       echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+    enable_sdt_probes=no
+    AC_MSG_RESULT([no])
+  else
+    AC_MSG_RESULT([yes])
+  fi
+fi
 AC_ARG_ENABLE([sdt-probes],
   [AS_HELP_STRING([--disable-sdt-probes],
                   [disable process.mark probes in staprun, stapio])])