Changeset 3939 for vendor/emacs-CVS_HEAD/configure.in

Timestamp:

11/01/05 07:08:22 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• vendor/emacs-CVS_HEAD/configure.in (modified) (5 diffs)

vendor/emacs-CVS_HEAD/configure.in

@@ -1090 +1090 @@
-    case "${canonical}" in
-      *-cygwin )                opsys=cygwin ;;
- ) 
+* )
-                                CPP="${CC-cc} -E -no-cpp-precomp"
-                                ;;
@@ -1669 +1669 @@
-fi
-
+HAVE_CARBON=no
+if test "${with_carbon}" != no; then
+  AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
+fi
+if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
+  if test "${with_carbon+set}" != set \
+     && test "${carbon_appdir_x+set}" != set; then
+    HAVE_CARBON=no
+  fi
+fi
+if test "${HAVE_CARBON}" = yes; then
+  window_system=mac
+fi
+
-case "${window_system}" in
-  x11 )
@@ -1687 +1701 @@
-    esac
-  ;;
-
+mac | 
-    HAVE_X_WINDOWS=no
-    HAVE_X11=no
@@ -1714 +1728 @@
-      ;;
-  esac
-fi
-
-HAVE_CARBON=no
-if test "${HAVE_X11}" != "yes"; then
-  if test "${with_carbon}" != "no"; then
-     AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
-  fi
-fi
-
@@ -2346 +2353 @@
-if test "${HAVE_CARBON}" = "yes"; then
-  AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
-  window_system=mac
-  ## Specify the install directory
-  carbon_appdir=