From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 1 May 2013 17:47:50 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1cb82edff21abfefd68af18370dddfd8cc1fec0;p=emacs.git

Merge from trunk.
---

b1cb82edff21abfefd68af18370dddfd8cc1fec0
diff --cc configure.ac
index 4130662e8e7,6c59dcaa7e3..ce99f086a42
--- a/configure.ac
+++ b/configure.ac
@@@ -642,16 -632,29 +642,32 @@@ if test "$ac_test_CFLAGS" != set; the
        [emacs_cv_prog_cc_g3],
        [AC_LINK_IFELSE([AC_LANG_PROGRAM()],
  	 [emacs_cv_prog_cc_g3=yes],
-          [emacs_cv_prog_cc_g3=no])])
-     if test $emacs_cv_prog_cc_g3 = yes; then
-       CFLAGS=$emacs_g3_CFLAGS
-     else
+ 	 [emacs_cv_prog_cc_g3=no])])
+     if test $emacs_cv_prog_cc_g3 != yes; then
        CFLAGS=$emacs_save_CFLAGS
      fi
 +    if test $opsys = mingw32; then
 +      CFLAGS="$CFLAGS -gdwarf-2"
 +    fi
    fi
+ 
+   case $CFLAGS in
+     *-O*) ;;
+     *)
+       # No optimization flag was inferred for this non-GCC compiler.
+       # Try -O.  This is needed for xlc on AIX; see Bug#14258.
+       emacs_save_CFLAGS=$CFLAGS
+       test -z "$CFLAGS" || CFLAGS="$CFLAGS "
+       CFLAGS=${CFLAGS}-O
+       AC_CACHE_CHECK([whether $CC accepts -O],
+         [emacs_cv_prog_cc_o],
+ 	[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ 	   [emacs_cv_prog_cc_o=yes],
+ 	   [emacs_cv_prog_cc_o=no])])
+       if test $emacs_cv_prog_cc_o != yes; then
+ 	CFLAGS=$emacs_save_CFLAGS
+       fi ;;
+   esac
  fi
  
  AC_ARG_ENABLE([gcc-warnings],