Mercurial > emacs

comparison configure.in @ 97354:0defde3a9c5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* s/darwin.h (OTHER_FILES): Do not define here, defined in config.in. * Makefile.in (ALL_OBJC_CFLAGS): New variable. (.m.o): Use it. * config.in: Regenerate. * Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES. Do not special case for NS_IMPL_COCOA. * configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable. AC_SUBST it. (GNU_OBJC_CFLAGS): Define as a shell variable instead of #define. AC_SUBST it. (OTHER_FILES): Always define for HAVE_NS. (C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA. * configure: Regenerate.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 07 Aug 2008 14:21:43 +0000
parents 945ae0a5779f
children 7c5d85abccae
comparison
equal deleted inserted replaced
97353:ca9f9affed30 97354:0defde3a9c5f
2047 ### Use NeXTstep API to implement GUI. 2047 ### Use NeXTstep API to implement GUI.
2048 if test "${HAVE_NS}" = "yes"; then 2048 if test "${HAVE_NS}" = "yes"; then
2049 AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.]) 2049 AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.])
2050 if test "${NS_IMPL_COCOA}" = "yes"; then 2050 if test "${NS_IMPL_COCOA}" = "yes"; then
2051 AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.]) 2051 AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.])
2052 GNU_OBJC_CFLAGS=
2053 LIB_SRC_EXTRA_INSTALLABLES=mac-fix-env
2052 fi 2054 fi
2053 if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then 2055 if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then
2054 AC_DEFINE(COCOA_EXPERIMENTAL_CTRL_G, 1, [Define to 1 if you are trying experimental enhanced Ctrl-g support using NS windowing under MacOS X.]) 2056 AC_DEFINE(COCOA_EXPERIMENTAL_CTRL_G, 1, [Define to 1 if you are trying experimental enhanced Ctrl-g support using NS windowing under MacOS X.])
2055 fi 2057 fi
2056 if test "${NS_IMPL_GNUSTEP}" = "yes"; then 2058 if test "${NS_IMPL_GNUSTEP}" = "yes"; then
2057 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) 2059 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
2060 GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
2058 fi 2061 fi
2059 if test "${NS_HAVE_NSINTEGER}" = "yes"; then 2062 if test "${NS_HAVE_NSINTEGER}" = "yes"; then
2060 AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.]) 2063 AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
2061 fi 2064 fi
2062 # We also have mouse menus. 2065 # We also have mouse menus.
2462 AC_SUBST(ns_appdir) 2465 AC_SUBST(ns_appdir)
2463 AC_SUBST(ns_appbindir) 2466 AC_SUBST(ns_appbindir)
2464 AC_SUBST(ns_appresdir) 2467 AC_SUBST(ns_appresdir)
2465 AC_SUBST(ns_appsrc) 2468 AC_SUBST(ns_appsrc)
2466 AC_SUBST(GNUSTEP_MAKEFILES) 2469 AC_SUBST(GNUSTEP_MAKEFILES)
2470 AC_SUBST(GNU_OBJC_CFLAGS)
2471 AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
2467 2472
2468 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", 2473 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
2469 [Define to the canonical Emacs configuration name.]) 2474 [Define to the canonical Emacs configuration name.])
2470 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", 2475 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
2471 [Define to the options passed to configure.]) 2476 [Define to the options passed to configure.])
2605 /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. 2610 /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
2606 (There is probably a better place to do this, but right now the Cocoa 2611 (There is probably a better place to do this, but right now the Cocoa
2607 side does this in s/darwin.h and we cannot 2612 side does this in s/darwin.h and we cannot
2608 parallel this exactly since GNUstep is multi-OS. */ 2613 parallel this exactly since GNUstep is multi-OS. */
2609 #ifdef HAVE_NS 2614 #ifdef HAVE_NS
2615 #define OTHER_FILES ns-app
2610 # ifdef NS_IMPL_GNUSTEP 2616 # ifdef NS_IMPL_GNUSTEP
2611 /* See also .m.o rule in Makefile.in */ 2617 /* See also .m.o rule in Makefile.in */
2612 # define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing 2618 # define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
2613 # define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE 2619 # endif /* NS_IMPL_GNUSTEP */
2614 # define OTHER_FILES ns-app
2615 # else /* NS_IMPL_COCOA */
2616 # define C_SWITCH_X_SYSTEM
2617 # define GNU_OBJC_CFLAGS
2618 # endif /* NS_IMPL_COCOA */
2619 #endif /* HAVE_NS */ 2620 #endif /* HAVE_NS */
2620 2621
2621 /* Define `subprocesses' should be defined if you want to 2622 /* `subprocesses' should be defined if you want to
2622 have code for asynchronous subprocesses 2623 have code for asynchronous subprocesses
2623 (as used in M-x compile and M-x shell). 2624 (as used in M-x compile and M-x shell).
2624 Only MSDOS does not support this. */ 2625 Only MSDOS does not support this. */
2625 2626
2626 #define subprocesses 2627 #define subprocesses