(nnmail-extra-headers): Add defvar.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index e354e585747eaade868ef82570d6885b482c7743..e4fa9db64534b48fa38f54deea99c31dfa59250f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,8 @@ dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
-dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl  Boston, MA 02111-1307, USA.
+dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl  Boston, MA 02110-1301, USA.
 
 AC_PREREQ(2.54)dnl
 AC_INIT(src/lisp.h)
@@ -142,6 +142,16 @@ else
 fi
 AC_SUBST(MAINT)
 
+AC_ARG_ENABLE(locallisppath,
+[  --enable-locallisppath=PATH
+                          directories Emacs should search for lisp files
+                          specific to this site],
+if test "${enableval}" = "no"; then
+  locallisppath=
+elif test "${enableval}" != "yes"; then
+  locallisppath=${enableval}
+fi)
+
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessarily, since pwd can
 #### give you automounter prefixes, which can go away.  We do all this
@@ -337,11 +347,6 @@ dnl see the `changequote' comment above.
     machine=arm opsys=gnu-linux
   ;;
 
-  ppc-*-linux | \
-  powerpc-*-linux* )
-    machine=macppc opsys=gnu-linux
-  ;;
-
   ## Altos 3068
   m68*-altos-sysv* )
     machine=altos opsys=usg5-2
@@ -1075,6 +1080,9 @@ dnl see the `changequote' comment above.
     machine=intel386
     case "${canonical}" in
       *-cygwin )                opsys=cygwin ;;
+      *-darwin )                opsys=darwin
+                                CPP="${CC-cc} -E -no-cpp-precomp"
+                               ;;
       *-lynxos* )               opsys=lynxos ;;
       *-isc1.* | *-isc2.[01]* )        opsys=386-ix ;;
       *-isc2.2* )              opsys=isc2-2 ;;
@@ -1282,7 +1290,7 @@ else
   LDFLAGS="$LDFLAGS -znocombreloc"
 fi
 
-AC_MSG_CHECKING([For -znocombreloc])
+AC_MSG_CHECKING([for -znocombreloc])
 AC_LINK_IFELSE([main(){return 0;}],
   [AC_MSG_RESULT(yes)],
   LDFLAGS=$late_LDFLAGS
@@ -1455,7 +1463,7 @@ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
   termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
-  sys/utsname.h)
+  sys/utsname.h pwd.h)
 
 AC_MSG_CHECKING(if personality LINUX32 can be set)
 AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
@@ -1699,6 +1707,13 @@ if test "${opsys}" = "hpux9shr"; then
   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
+
 ### Compute the unexec source name from the object name.
 UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
 
@@ -2160,6 +2175,9 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
   elif test "${HAVE_GTK}" = "yes"; then
     AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
     USE_TOOLKIT_SCROLL_BARS=yes
+  elif test "${HAVE_CARBON}" = "yes"; then
+    AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
+    USE_TOOLKIT_SCROLL_BARS=yes
   fi
 fi
 
@@ -2313,15 +2331,10 @@ if test "${HAVE_X11}" = "yes"; then
   fi
 fi
 
-### Use Mac OS X Carbon API to implement GUI.
-HAVE_CARBON=no
-if test "${with_carbon}" != "no"; then
-  AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
-fi
-
 dnl Check for malloc/malloc.h on darwin
 AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.]))
 
+### Use Mac OS X Carbon API to implement GUI.
 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
@@ -2335,6 +2348,15 @@ if test "${HAVE_CARBON}" = "yes"; then
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
+
+  tmp_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -framework Carbon"
+  AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
+  if test "$have_cmt" = yes; then
+    AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
+              [Define to 1 if CancelMenuTracking is available (Mac OSX).])
+  fi
+  CFLAGS="$tmp_CFLAGS"
 fi
 
 ### Use session management (-lSM -lICE) if available
@@ -2412,6 +2434,15 @@ AC_FUNC_GETLOADAVG
 
 AC_FUNC_FSEEKO
 
+# Configure getopt.
+m4_include([m4/getopt.m4])
+gl_GETOPT_IFELSE([
+  gl_GETOPT_SUBSTITUTE_HEADER
+  gl_PREREQ_GETOPT
+  GETOPTOBJS='getopt.o getopt1.o'
+])
+AC_SUBST(GETOPTOBJS)
+
 AC_FUNC_GETPGRP
 
 AC_FUNC_STRFTIME
@@ -2791,8 +2822,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code