[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100641: * configure.in: Add i386 to cpp_undefs (Bug#8497).

[Chong Yidong]

------------------------------------------------------------
revno: 100641
author: Glenn Morris <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Thu 2012-01-12 18:11:38 +0800
message:
  * configure.in: Add i386 to cpp_undefs (Bug#8497).
modified:
  ChangeLog
  configure
  configure.in
  lisp/dired.el
  lisp/emacs-lisp/cl-loaddefs.el
  lisp/emulation/tpu-edt.el
  lisp/ibuffer.el
  lisp/mail/rmail.el
  lisp/ps-print.el

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-01-11 07:52:35 +0000
+++ b/ChangeLog 2012-01-12 10:11:38 +0000
@@ -1,3 +1,7 @@
+2012-01-12  Glenn Morris  <address@hidden>
+
+       * configure.in: Add i386 to cpp_undefs (Bug#8497).
+
 2011-03-13  Glenn Morris  <address@hidden>
 
        * configure.in (FREETYPE_LIBS): Actually set it to something.

=== modified file 'configure'
--- a/configure 2011-03-01 03:29:00 +0000
+++ b/configure 2012-01-12 10:11:38 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for emacs 23.3.
+# Generated by GNU Autoconf 2.67 for emacs 23.3.50.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='23.3'
-PACKAGE_STRING='emacs 23.3'
+PACKAGE_VERSION='23.3.50'
+PACKAGE_STRING='emacs 23.3.50'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -634,12 +634,12 @@
 LIBOBJS
 liblockfile
 ALLOCA
-FREETYPE_LIBS
-FREETYPE_CFLAGS
 M17N_FLT_LIBS
 M17N_FLT_CFLAGS
 LIBOTF_LIBS
 LIBOTF_CFLAGS
+FREETYPE_LIBS
+FREETYPE_CFLAGS
 XFT_LIBS
 XFT_CFLAGS
 FONTCONFIG_LIBS
@@ -1320,7 +1320,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures emacs 23.3 to adapt to many kinds of systems.
+\`configure' configures emacs 23.3.50 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1394,7 +1394,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 23.3:";;
+     short | recursive ) echo "Configuration of emacs 23.3.50:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1540,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 23.3
+emacs configure 23.3.50
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by emacs $as_me 23.3, which was
+It was created by emacs $as_me 23.3.50, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -9421,18 +9421,108 @@
       fi                          # "$HAVE_XFT" != no
     fi                            # "x${with_xft}" != "xno"
 
-        if test "$HAVE_XFT" != "yes"; then
-       HAVE_XFT=no
-    fi
-
-
-    HAVE_FREETYPE=no
     ## We used to allow building with FreeType and without Xft.
     ## However, the ftx font backend driver is not in good shape.
-    if test "${HAVE_XFT}" = "yes"; then
-                  HAVE_FREETYPE=yes
-      FONTCONFIG_CFLAGS=
-      FONTCONFIG_LIBS=
+    if test "$HAVE_XFT" != "yes"; then
+              HAVE_XFT=no
+       HAVE_FREETYPE=no
+    else
+
+  succeeded=no
+
+  # Extract the first word of "pkg-config", so it can be a program name with 
args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a 
path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test "$PKG_CONFIG" = "no" ; then
+     HAVE_FREETYPE=no
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
+$as_echo_n "checking for freetype2... " >&6; }
+
+        if $PKG_CONFIG --exists "freetype2" 2>&5; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" 
>&5
+$as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
+            FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 
's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" 
>&5
+$as_echo "$FREETYPE_CFLAGS" >&6; }
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" 
>&5
+$as_echo_n "checking FREETYPE_LIBS... " >&6; }
+            FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" 
>&5
+$as_echo "$FREETYPE_LIBS" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            FREETYPE_CFLAGS=""
+            FREETYPE_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors 
"freetype2"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version 
$PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig";
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     HAVE_FREETYPE=yes
+  else
+     HAVE_FREETYPE=no
+  fi
+
+
+       test "$HAVE_FREETYPE" = "no" && as_fn_error $? "libxft requires 
libfreetype" "$LINENO" 5
     fi
 
     HAVE_LIBOTF=no
@@ -13524,7 +13614,12 @@
 # the C preprocessor to some helpful value like 1, or maybe the empty
 # string.  Needless to say consequent macro substitutions are less
 # than conducive to the makefile finding the correct directory.
-cpp_undefs="`echo $srcdir $configuration $canonical unix |
+
+case $canonical in
+     i[456]86-*) extra_undefs=i386 ;;
+     *) extra_undefs= ;;
+esac
+cpp_undefs="`echo $srcdir $configuration $canonical unix $extra_undefs |
   sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/  *$//' \
   -e 's/  */ -U/g' -e 's/-U[0-9][^ ]*//g'`"
 
@@ -14056,7 +14151,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by emacs $as_me 23.3, which was
+This file was extended by emacs $as_me 23.3.50, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14122,7 +14217,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-emacs config.status 23.3
+emacs config.status 23.3.50
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.in'
--- a/configure.in      2012-01-11 07:52:35 +0000
+++ b/configure.in      2012-01-12 10:11:38 +0000
@@ -3103,7 +3103,12 @@
 # the C preprocessor to some helpful value like 1, or maybe the empty
 # string.  Needless to say consequent macro substitutions are less
 # than conducive to the makefile finding the correct directory.
-[cpp_undefs="`echo $srcdir $configuration $canonical unix |
+[
+case $canonical in
+     i[456]86-*) extra_undefs=i386 ;;
+     *) extra_undefs= ;;
+esac
+cpp_undefs="`echo $srcdir $configuration $canonical unix $extra_undefs |
   sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/  *$//' \
   -e 's/  */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2012-01-11 07:52:35 +0000
+++ b/lisp/dired.el     2012-01-12 10:11:38 +0000
@@ -3535,7 +3535,7 @@
 ;;;;;;  dired-run-shell-command dired-do-shell-command 
dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories 
dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" 
"255ac82c318ef43da2e47b931c0f8581")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" 
"5c808b5844089e8163267d98a75a79b5")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -3988,7 +3988,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "48197b7ca054193643e01957196dd491")
+;;;;;;  "25cbb465646a090b02d3780f94e44583")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2011-03-11 15:34:07 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2012-01-12 10:11:38 +0000
@@ -10,7 +10,7 @@
 ;;;;;;  ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p
 ;;;;;;  cl-map-overlays cl-map-intervals cl-map-keymap-recursively
 ;;;;;;  notevery notany every some mapcon mapcan mapl maplist map
-;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" 
"de874ef326082f133b0324505ad37330")
+;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" 
"2ad388f5b02cbddb80b7ed6724f5c7d1")
 ;;; Generated autoloads from cl-extra.el
 
 (autoload 'coerce "cl-extra" "\
@@ -282,7 +282,7 @@
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"12451ac01f94f10d30cf7a8f92625c42")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"42c2aedfe68e4adf341955223bcf31b9")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -759,7 +759,7 @@
 ;;;;;;  find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
 ;;;;;;  substitute-if substitute delete-duplicates remove-duplicates
 ;;;;;;  delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" 
"50667ae0688aa15dad8a585096e7144f")
+;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" 
"3be8c58a761d2491b5afbf3f098c978b")
 ;;; Generated autoloads from cl-seq.el
 
 (autoload 'reduce "cl-seq" "\

=== modified file 'lisp/emulation/tpu-edt.el'
--- a/lisp/emulation/tpu-edt.el 2012-01-11 07:52:35 +0000
+++ b/lisp/emulation/tpu-edt.el 2012-01-12 10:11:38 +0000
@@ -2438,7 +2438,7 @@
 
 
 ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free 
tpu-set-scroll-margins
-;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" 
"a564a0c82b232d8c113549f6fd0ce8e5")
+;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" 
"c4b741ca96bf5d7a6c13c5843c9bcb40")
 ;;; Generated autoloads from tpu-extras.el
 
 (autoload 'tpu-cursor-free-mode "tpu-extras" "\

=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el   2012-01-11 07:52:35 +0000
+++ b/lisp/ibuffer.el   2012-01-12 10:11:38 +0000
@@ -2641,7 +2641,7 @@
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" 
"f6e06ce5f548106a2ffa2f3029ce5eda")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" 
"c89fc10b51c7dcf6fb6df3fe0ee081e8")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-01-11 07:52:35 +0000
+++ b/lisp/mail/rmail.el        2012-01-12 10:11:38 +0000
@@ -4242,7 +4242,7 @@
 ;;; Start of automatically extracted autoloads.
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
-;;;;;;  "ecd28d8d92983488673388eced6fbf50")
+;;;;;;  "c91d48e0a6ac591b41a3f3c6c1699728")
 ;;; Generated autoloads from rmailedit.el
 
 (autoload 'rmail-edit-current-message "rmailedit" "\
@@ -4254,7 +4254,7 @@
 
 ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
 ;;;;;;  rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;;  "rmailkwd.el" "bc72ffe3652be6f4c72048ae8f226fce")
+;;;;;;  "rmailkwd.el" "2b9b926fb3f063ff94bd9841c6c2a867")
 ;;; Generated autoloads from rmailkwd.el
 
 (autoload 'rmail-add-label "rmailkwd" "\
@@ -4297,7 +4297,7 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"736579c1ea88e1f0e1ec21b8a50bc2a2")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"39f6cb6eedf9e01240bfe028805c8224")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
@@ -4323,7 +4323,7 @@
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el"
-;;;;;;  "9319e5b606ad5786c0c5994a307a38e8")
+;;;;;;  "b2c998ec7f4b769af2150e0963a43f73")
 ;;; Generated autoloads from rmailmsc.el
 
 (autoload 'set-rmail-inbox-list "rmailmsc" "\
@@ -4339,7 +4339,7 @@
 
 ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines 
rmail-sort-by-correspondent
 ;;;;;;  rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject
-;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" 
"16144a77fdc880034875fd624e4d73e6")
+;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" 
"45942230593e37f0f689f0f49a5085f1")
 ;;; Generated autoloads from rmailsort.el
 
 (autoload 'rmail-sort-by-date "rmailsort" "\
@@ -4398,7 +4398,7 @@
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients 
rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" 
"6bcfd5937a56902944a929b89b33adaa")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" 
"90c140f81e8a6595954d632d8952b7ec")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
@@ -4446,7 +4446,7 @@
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "undigest.el" "2869c38a0051d0acab1a5968627fa57d")
+;;;;;;  "undigest" "undigest.el" "0874873291f9756d65aff5260100ff26")
 ;;; Generated autoloads from undigest.el
 
 (autoload 'undigestify-rmail-message "undigest" "\

=== modified file 'lisp/ps-print.el'
--- a/lisp/ps-print.el  2012-01-11 07:52:35 +0000
+++ b/lisp/ps-print.el  2012-01-12 10:11:38 +0000
@@ -6662,7 +6662,7 @@
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" 
"7fadcd6c4b18087e900bd21e6da5e854")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" 
"371cbfd7a980b9fb80a68013dc44ef1f")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\