[Python-checkins] cpython: - Issue #14324: use a linker test to check for profiling support
matthias.klose
python-checkins at python.org
Sat Jun 30 16:54:47 CEST 2012
http://hg.python.org/cpython/rev/575efae8ec57
changeset: 77869:575efae8ec57
user: doko at ubuntu.com
date: Sat Jun 30 16:52:05 2012 +0200
summary:
- Issue #14324: use a linker test to check for profiling support
files:
configure | 52 +++++++++++++++++++--------------------
configure.ac | 35 +++++++++++++-------------
2 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -3211,7 +3211,7 @@
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
- irix646) MACHDEP="irix6";;
+ irix646) MACHDEP="irix6";;
'') MACHDEP="unknown";;
esac
fi
@@ -5424,36 +5424,34 @@
$as_echo_n "checking for --enable-profiling... " >&6; }
# Check whether --enable-profiling was given.
if test "${enable_profiling+set}" = set; then :
- enableval=$enable_profiling; ac_save_cc="$CC"
- CC="$CC -pg"
- if test "$cross_compiling" = yes; then :
- ac_enable_profiling="no"
-else
+ enableval=$enable_profiling;
+fi
+
+if test "x$enable_profiling" = xyes; then
+ ac_save_cc="$CC"
+ CC="$(CC) -pg"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int main() { return 0; }
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_enable_profiling="yes"
-else
- ac_enable_profiling="no"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- CC="$ac_save_cc"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_enable_profiling" >&5
-$as_echo "$ac_enable_profiling" >&6; }
-
-case "$ac_enable_profiling" in
- "yes")
- BASECFLAGS="-pg $BASECFLAGS"
- LDFLAGS="-pg $LDFLAGS"
- ;;
-esac
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+ enable_profiling=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CC="$ac_save_cc"
+else
+ enable_profiling=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5
+$as_echo "$enable_profiling" >&6; }
+
+if test "x$enable_profiling" = xyes; then
+ BASECFLAGS="-pg $BASECFLAGS"
+ LDFLAGS="-pg $LDFLAGS"
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5
$as_echo_n "checking LDLIBRARY... " >&6; }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,7 @@
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
- irix646) MACHDEP="irix6";;
+ irix646) MACHDEP="irix6";;
'') MACHDEP="unknown";;
esac
fi
@@ -813,22 +813,23 @@
AC_MSG_CHECKING(for --enable-profiling)
AC_ARG_ENABLE(profiling,
- AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]),
-[ac_save_cc="$CC"
- CC="$CC -pg"
- AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
- [ac_enable_profiling="yes"],
- [ac_enable_profiling="no"],
- [ac_enable_profiling="no"])
- CC="$ac_save_cc"])
-AC_MSG_RESULT($ac_enable_profiling)
-
-case "$ac_enable_profiling" in
- "yes")
- BASECFLAGS="-pg $BASECFLAGS"
- LDFLAGS="-pg $LDFLAGS"
- ;;
-esac
+ AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]))
+if test "x$enable_profiling" = xyes; then
+ ac_save_cc="$CC"
+ CC="$(CC) -pg"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
+ [],
+ [enable_profiling=no])
+ CC="$ac_save_cc"
+else
+ enable_profiling=no
+fi
+AC_MSG_RESULT($enable_profiling)
+
+if test "x$enable_profiling" = xyes; then
+ BASECFLAGS="-pg $BASECFLAGS"
+ LDFLAGS="-pg $LDFLAGS"
+fi
AC_MSG_CHECKING(LDLIBRARY)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list