From: Andrew Choi Date: Thu, 7 Aug 2003 16:00:31 +0000 (+0000) Subject: * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp X-Git-Tag: ttn-vms-21-2-B4~9137 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=abd39b57199460ebbfcd4d98f9824fa8275f23e9;p=emacs.git * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp option instead of -traditional-cpp for CPP. --- diff --git a/ChangeLog b/ChangeLog index 696b095885c..1033a51d6ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-08-07 Andrew Choi + + * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp + option instead of -traditional-cpp for CPP. + 2003-07-29 Richard M. Stallman * configure.in (HAVE_XIM): Define if XIM is available. @@ -304,7 +309,7 @@ (*-sunos5.6*, *-solaris2.6*): New alternative. (*-sunos5*): Use version 2.6 as default. -2002-09-06 Kai Gro,b_(Bjohann +2002-09-06 Kai Gro,A_(Bjohann * configure.in: Fix typo. @@ -339,15 +344,15 @@ * configure.in (gamedir): Handle it like lispdir. (--with-game-dir option): Delete. -2002-06-21 Pavel Jan,Bm(Bk +2002-06-21 Pavel Jan,Am(Bk * configure.in: Add support for mipseb-*-netbsd* machines. -2002-06-18 Kai Gro,b_(Bjohann +2002-06-18 Kai Gro,A_(Bjohann * Makefile.in (install-arch-indep, uninstall): Add Tramp. -2002-06-17 Kai Gro,b_(Bjohann +2002-06-17 Kai Gro,A_(Bjohann * info/dir (File): Add an entry for Tramp. @@ -371,7 +376,7 @@ * configure.in (emacs_cv_speed_t): Add square brackets for clarity. -2002-05-04 Pavel Jan,Bm(Bk +2002-05-04 Pavel Jan,Am(Bk * make-dist: Do not distribute lock/ directory. @@ -385,7 +390,7 @@ * configure.in: Delete configure check for access to the game user. -2002-04-29 Pavel Jan,Bm(Bk +2002-04-29 Pavel Jan,Am(Bk * make-dist: lwlib/Imakefile is removed. @@ -396,7 +401,7 @@ * make-dist: Create directories in mac/Emacs.app. -2002-04-25 Pavel Jan,Bm(Bk +2002-04-25 Pavel Jan,Am(Bk * make-dist: lwlib-Xol* are removed. @@ -423,7 +428,7 @@ * configure.in: Add --game-dir, --game-user. Test to see if we can use them. -2002-04-08 Pavel Jan,Bm(Bk +2002-04-08 Pavel Jan,Am(Bk * configure.in: Add --with-sound. @@ -511,7 +516,7 @@ * configure.in (hppa*-*-linux-gnu*): New alternative. -2001-12-08 Pavel Jan,Bm(Bk +2001-12-08 Pavel Jan,Am(Bk * make-dist: Copy COPYING to leim/, lwlib/, mac/ and nt/ when creating distribution. @@ -524,12 +529,12 @@ (HAVE_DES_H, HAVE_KRB5_H): Properly quote args of AC_CHECK_HEADERS; this is required by recent Autoconf versions. -2001-12-02 Pavel Jan,Bm(Bk +2001-12-02 Pavel Jan,Am(Bk * make-dist: Do not try to link removed files (aclocal.m4, _emacs, TODO, vms-pp.trans and others). -2001-11-29 Pavel Jan,Bm(Bk +2001-11-29 Pavel Jan,Am(Bk * make-dist: Use COPYING from the top-level directory. @@ -537,7 +542,7 @@ * configure.in: Add support for FreeBSD/Alpha. -2001-11-29 Pavel Jan,Bm(Bk +2001-11-29 Pavel Jan,Am(Bk * make-dist: Add COPYING to the top-level directory of the distribution. Simplify the logic behind copying. @@ -582,7 +587,7 @@ 2001-11-22 Colin Walters * Makefile.in (install-arch-indep): Install the calc .info files. - (uninstall): Handle deletion of calc .info files (thanks Pavel Jan,Bm(Bk). + (uninstall): Handle deletion of calc .info files (thanks Pavel Jan,Am(Bk). 2001-11-17 Eli Zaretskii @@ -593,14 +598,14 @@ * configure.in: Add coff.h to the list in AC_CHECK_HEADERS. -2001-11-15 Pavel Jan,Bm(Bk +2001-11-15 Pavel Jan,Am(Bk * Makefile.in (uninstall): Fix previous change. * configure.in, Makefile.in: Add support for --program-prefix, --program-suffix and --program-transform-name options. -2001-11-13 Pavel Jan,Bm(Bk +2001-11-13 Pavel Jan,Am(Bk * Makefile.in (install-arch-indep): Use `${manext}' instead of `.1'. (install-arch-indep): Install emacsclient manual page. @@ -609,9 +614,9 @@ 2001-11-12 Eli Zaretskii * make-dist: Add lispref/index.*perm files to the distribution. - From Pavel Jan,Bm(Bk . + From Pavel Jan,Am(Bk . -2001-11-12 Pavel Jan,Bm(Bk +2001-11-12 Pavel Jan,Am(Bk * Makefile.in (uninstall): Remove gfdl.1 when uninstalling. @@ -648,7 +653,7 @@ * configure.in: Added a check for -2001-11-01 Pavel Jan,Bm(Bk +2001-11-01 Pavel Jan,Am(Bk * configure.in: Reindent --help output. From Per Starback (starback@ling.uu.se). diff --git a/configure b/configure index 4d417642c2d..75602df1483 100755 --- a/configure +++ b/configure @@ -2576,7 +2576,7 @@ _ACEOF powerpc-apple-darwin* ) machine=powermac opsys=darwin # Define CPP as follows to make autoconf work correctly. - CPP="cc -E -traditional-cpp" + CPP="gcc -E -no-cpp-precomp" ;; ## AMD x86-64 Linux-based GNU system @@ -3420,7 +3420,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -3434,8 +3435,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -8191,7 +8192,7 @@ echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with { (exit 1); exit 1; }; }; fi GLIB_REQUIRED=2.0.1 - GTK_REQUIRED=2.0.1 + GTK_REQUIRED=2.2 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" if test "X${with_pkg_config_prog}" != X; then @@ -8910,6 +8911,50 @@ _ACEOF fi fi +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include +int +main () +{ +XIMProc callback; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + HAVE_XIM=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XIM 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +HAVE_XIM=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + if test "${with_xim}" != "no"; then @@ -8918,7 +8963,9 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi -if test "${HAVE_X11}" = "yes"; then + + +if test "${HAVE_XIM}" != "no"; then late_CFLAGS=$CFLAGS if test "$GCC" = yes; then CFLAGS="$CFLAGS --pedantic-errors" diff --git a/configure.in b/configure.in index abe9d262589..627956c84f6 100644 --- a/configure.in +++ b/configure.in @@ -1134,7 +1134,7 @@ dnl see the `changequote' comment above. powerpc-apple-darwin* ) machine=powermac opsys=darwin # Define CPP as follows to make autoconf work correctly. - CPP="cc -E -traditional-cpp" + CPP="gcc -E -no-cpp-precomp" ;; ## AMD x86-64 Linux-based GNU system