Mercurial > emacs
comparison configure.in @ 97334:07a0633dcf4c
* configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep.* configure: Regenerate.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Wed, 06 Aug 2008 16:19:43 +0000 |
parents | 299a284fd85c |
children | ac1bfb10ff9e |
comparison
equal
deleted
inserted
replaced
97333:4fb874878836 | 97334:07a0633dcf4c |
---|---|
1234 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1234 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
1235 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1235 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
1236 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" | 1236 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" |
1237 fi | 1237 fi |
1238 AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes) | 1238 AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes) |
1239 NS_HAVE_INTEGER=yes | 1239 NS_HAVE_NSINTEGER=yes |
1240 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>], | 1240 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>], |
1241 [NSInteger i;])], | 1241 [NSInteger i;])], |
1242 ns_have_integer=yes, | 1242 ns_have_nsinteger=yes, |
1243 ns_have_integer=no) | 1243 ns_have_nsinteger=no) |
1244 if test $ns_have_integer = no; then | 1244 if test $ns_have_nsinteger = no; then |
1245 NS_HAVE_INTEGER=no | 1245 NS_HAVE_NSINTEGER=no |
1246 fi | 1246 fi |
1247 fi | 1247 fi |
1248 if test "${HAVE_NS}" = yes; then | 1248 if test "${HAVE_NS}" = yes; then |
1249 window_system=nextstep | 1249 window_system=nextstep |
1250 with_xft=no | 1250 with_xft=no |
2052 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.]) | 2052 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.]) |
2053 fi | 2053 fi |
2054 if test "${NS_IMPL_GNUSTEP}" = "yes"; then | 2054 if test "${NS_IMPL_GNUSTEP}" = "yes"; then |
2055 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) | 2055 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) |
2056 fi | 2056 fi |
2057 if test "${NS_HAVE_INTEGER}" = "yes"; then | 2057 if test "${NS_HAVE_NSINTEGER}" = "yes"; then |
2058 AC_DEFINE(NS_HAVE_INTEGER, 1, [Define to 1 if `NSInteger' is defined.]) | 2058 AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.]) |
2059 fi | 2059 fi |
2060 # We also have mouse menus. | 2060 # We also have mouse menus. |
2061 HAVE_MENUS=yes | 2061 HAVE_MENUS=yes |
2062 fi | 2062 fi |
2063 | 2063 |
2608 # ifdef C_SWITCH_SYSTEM | 2608 # ifdef C_SWITCH_SYSTEM |
2609 # undef C_SWITCH_SYSTEM | 2609 # undef C_SWITCH_SYSTEM |
2610 # endif | 2610 # endif |
2611 # ifdef NS_IMPL_GNUSTEP | 2611 # ifdef NS_IMPL_GNUSTEP |
2612 /* See also .m.o rule in Makefile.in */ | 2612 /* See also .m.o rule in Makefile.in */ |
2613 # define C_SWITCH_X_SYSTEM -MMD -MP -D_REENTRANT -fPIC -fno-strict-aliasing | 2613 # define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing |
2614 # 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 | 2614 # 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 |
2615 # define OTHER_FILES ns-app | 2615 # define OTHER_FILES ns-app |
2616 # else /* NS_IMPL_COCOA */ | 2616 # else /* NS_IMPL_COCOA */ |
2617 # define C_SWITCH_X_SYSTEM | 2617 # define C_SWITCH_X_SYSTEM |
2618 # define GNU_OBJC_CFLAGS | 2618 # define GNU_OBJC_CFLAGS |