[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Thu, 07 Aug 2008 14:21:48 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/08/07 14:21:43
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -b -r1.559 -r1.560
--- configure.in 7 Aug 2008 08:54:11 -0000 1.559
+++ configure.in 7 Aug 2008 14:21:39 -0000 1.560
@@ -2049,12 +2049,15 @@
AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either
GNUstep or Cocoa on Mac OS X.])
if test "${NS_IMPL_COCOA}" = "yes"; then
AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing
under MacOS X.])
+ GNU_OBJC_CFLAGS=
+ LIB_SRC_EXTRA_INSTALLABLES=mac-fix-env
fi
if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then
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.])
fi
if test "${NS_IMPL_GNUSTEP}" = "yes"; then
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing
under GNUstep.])
+ GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import
-fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1
-DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
fi
if test "${NS_HAVE_NSINTEGER}" = "yes"; then
AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
@@ -2464,6 +2467,8 @@
AC_SUBST(ns_appresdir)
AC_SUBST(ns_appsrc)
AC_SUBST(GNUSTEP_MAKEFILES)
+AC_SUBST(GNU_OBJC_CFLAGS)
+AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
@@ -2607,18 +2612,14 @@
side does this in s/darwin.h and we cannot
parallel this exactly since GNUstep is multi-OS. */
#ifdef HAVE_NS
+#define OTHER_FILES ns-app
# ifdef NS_IMPL_GNUSTEP
/* See also .m.o rule in Makefile.in */
# define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
-# 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
-# define OTHER_FILES ns-app
-# else /* NS_IMPL_COCOA */
-# define C_SWITCH_X_SYSTEM
-# define GNU_OBJC_CFLAGS
-# endif /* NS_IMPL_COCOA */
+# endif /* NS_IMPL_GNUSTEP */
#endif /* HAVE_NS */
-/* Define `subprocesses' should be defined if you want to
+/* `subprocesses' should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
Only MSDOS does not support this. */
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/05
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Adrian Robert, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Adrian Robert, 2008/08/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/08/07
- [Emacs-diffs] Changes to emacs/configure.in,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/21
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/08/24
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2008/08/28