[Python-checkins] cpython: - Issue #3754: Some unrelated configure.ac cleanups.

[matthias.klose]

http://hg.python.org/cpython/rev/d158b0a78390
changeset:   77870:d158b0a78390
user:        doko at ubuntu.com
date:        Sat Jun 30 17:05:13 2012 +0200
summary:
  - Issue #3754: Some unrelated configure.ac cleanups.

files:
  configure    |  23 ++++++++++++++---------
  configure.ac |  10 +++++++---
  2 files changed, 21 insertions(+), 12 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -9860,14 +9860,14 @@
 if test -z "$with_pymalloc"
 then
     with_pymalloc="yes"
+fi
+if test "$with_pymalloc" != "no"
+then
+
+$as_echo "#define WITH_PYMALLOC 1" >>confdefs.h
+
     ABIFLAGS="${ABIFLAGS}m"
 fi
-if test "$with_pymalloc" != "no"
-then
-
-$as_echo "#define WITH_PYMALLOC 1" >>confdefs.h
-
-fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
 $as_echo "$with_pymalloc" >&6; }
 
@@ -9964,8 +9964,13 @@
 else
 	MACHDEP_OBJS="$MACHDEP_OBJS $extra_machdep_objs"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: MACHDEP_OBJS" >&5
-$as_echo "MACHDEP_OBJS" >&6; }
+if test -z "$MACHDEP_OBJS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP_OBJS" >&5
+$as_echo "$MACHDEP_OBJS" >&6; }
+fi
 
 # checks for library functions
 for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
@@ -11497,7 +11502,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
 $as_echo "$ac_cv_buggy_getaddrinfo" >&6; }
 
-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
+if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
 then
 	if test $ipv6 = yes
 	then
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2594,12 +2594,12 @@
 if test -z "$with_pymalloc"
 then
     with_pymalloc="yes"
-    ABIFLAGS="${ABIFLAGS}m"
 fi
 if test "$with_pymalloc" != "no"
 then
     AC_DEFINE(WITH_PYMALLOC, 1, 
      [Define if you want to compile in Python-specific mallocs])
+    ABIFLAGS="${ABIFLAGS}m"
 fi
 AC_MSG_RESULT($with_pymalloc)
 
@@ -2668,7 +2668,11 @@
 else
 	MACHDEP_OBJS="$MACHDEP_OBJS $extra_machdep_objs"
 fi
-AC_MSG_RESULT(MACHDEP_OBJS)
+if test -z "$MACHDEP_OBJS"; then
+  AC_MSG_RESULT([none])
+else
+  AC_MSG_RESULT([$MACHDEP_OBJS])
+fi
 
 # checks for library functions
 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
@@ -3128,7 +3132,7 @@
 
 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
 
-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
+if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
 then
 	if test $ipv6 = yes
 	then

-- 
Repository URL: http://hg.python.org/cpython