aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-11 06:17:27 -0400
committerGlenn Morris2012-04-11 06:17:27 -0400
commitf867f9971dff3ea37fb8a5d369341d65522694ff (patch)
tree4974767f6fbfbeb450fead903e9f5ef090810933
parentd57de7fe59decee7ac865ee0af7f658610bc890a (diff)
downloademacs-f867f9971dff3ea37fb8a5d369341d65522694ff.tar.gz
emacs-f867f9971dff3ea37fb8a5d369341d65522694ff.zip
Auto-commit of generated files.
-rw-r--r--autogen/Makefile.in2
-rwxr-xr-xautogen/configure6
2 files changed, 4 insertions, 4 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 4ade989d095..048b3c2fc8c 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -152,7 +152,6 @@ CYGWIN_OBJ = @CYGWIN_OBJ@
152C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ 152C_SWITCH_MACHINE = @C_SWITCH_MACHINE@
153C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ 153C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@
154C_SWITCH_X_SITE = @C_SWITCH_X_SITE@ 154C_SWITCH_X_SITE = @C_SWITCH_X_SITE@
155C_SWITCH_X_SYSTEM = @C_SWITCH_X_SYSTEM@
156C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ 155C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
157DBUS_CFLAGS = @DBUS_CFLAGS@ 156DBUS_CFLAGS = @DBUS_CFLAGS@
158DBUS_LIBS = @DBUS_LIBS@ 157DBUS_LIBS = @DBUS_LIBS@
@@ -332,6 +331,7 @@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
332GNULIB_WCTOMB = @GNULIB_WCTOMB@ 331GNULIB_WCTOMB = @GNULIB_WCTOMB@
333GNULIB_WRITE = @GNULIB_WRITE@ 332GNULIB_WRITE = @GNULIB_WRITE@
334GNULIB__EXIT = @GNULIB__EXIT@ 333GNULIB__EXIT = @GNULIB__EXIT@
334GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@
335GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ 335GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@
336GREP = @GREP@ 336GREP = @GREP@
337GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@ 337GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@
diff --git a/autogen/configure b/autogen/configure
index 63e9348bb0c..d168c07dac7 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1087,7 +1087,7 @@ ns_appdir
1087S_FILE 1087S_FILE
1088M_FILE 1088M_FILE
1089X_TOOLKIT_TYPE 1089X_TOOLKIT_TYPE
1090C_SWITCH_X_SYSTEM 1090GNUSTEP_CFLAGS
1091C_SWITCH_X_SITE 1091C_SWITCH_X_SITE
1092LD_SWITCH_X_SITE 1092LD_SWITCH_X_SITE
1093gameuser 1093gameuser
@@ -13413,7 +13413,7 @@ fi
13413 13413
13414 13414
13415 13415
13416C_SWITCH_X_SYSTEM= 13416GNUSTEP_CFLAGS=
13417### Use NeXTstep API to implement GUI. 13417### Use NeXTstep API to implement GUI.
13418if test "${HAVE_NS}" = "yes"; then 13418if test "${HAVE_NS}" = "yes"; then
13419 13419
@@ -13430,7 +13430,7 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h
13430 13430
13431 # See also .m.o rule in Makefile.in */ 13431 # See also .m.o rule in Makefile.in */
13432 # FIXME: are all these flags really needed? Document here why. */ 13432 # FIXME: are all these flags really needed? Document here why. */
13433 C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" 13433 GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
13434 ## Extra CFLAGS applied to src/*.m files. 13434 ## Extra CFLAGS applied to src/*.m files.
13435 GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" 13435 GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
13436 fi 13436 fi