diff options
| author | Glenn Morris | 2012-04-11 06:17:27 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-04-11 06:17:27 -0400 |
| commit | f867f9971dff3ea37fb8a5d369341d65522694ff (patch) | |
| tree | 4974767f6fbfbeb450fead903e9f5ef090810933 | |
| parent | d57de7fe59decee7ac865ee0af7f658610bc890a (diff) | |
| download | emacs-f867f9971dff3ea37fb8a5d369341d65522694ff.tar.gz emacs-f867f9971dff3ea37fb8a5d369341d65522694ff.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 2 | ||||
| -rwxr-xr-x | autogen/configure | 6 |
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@ | |||
| 152 | C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ | 152 | C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ |
| 153 | C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ | 153 | C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ |
| 154 | C_SWITCH_X_SITE = @C_SWITCH_X_SITE@ | 154 | C_SWITCH_X_SITE = @C_SWITCH_X_SITE@ |
| 155 | C_SWITCH_X_SYSTEM = @C_SWITCH_X_SYSTEM@ | ||
| 156 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ | 155 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ |
| 157 | DBUS_CFLAGS = @DBUS_CFLAGS@ | 156 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
| 158 | DBUS_LIBS = @DBUS_LIBS@ | 157 | DBUS_LIBS = @DBUS_LIBS@ |
| @@ -332,6 +331,7 @@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ | |||
| 332 | GNULIB_WCTOMB = @GNULIB_WCTOMB@ | 331 | GNULIB_WCTOMB = @GNULIB_WCTOMB@ |
| 333 | GNULIB_WRITE = @GNULIB_WRITE@ | 332 | GNULIB_WRITE = @GNULIB_WRITE@ |
| 334 | GNULIB__EXIT = @GNULIB__EXIT@ | 333 | GNULIB__EXIT = @GNULIB__EXIT@ |
| 334 | GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@ | ||
| 335 | GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ | 335 | GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ |
| 336 | GREP = @GREP@ | 336 | GREP = @GREP@ |
| 337 | GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@ | 337 | GSETTINGS_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 | |||
| 1087 | S_FILE | 1087 | S_FILE |
| 1088 | M_FILE | 1088 | M_FILE |
| 1089 | X_TOOLKIT_TYPE | 1089 | X_TOOLKIT_TYPE |
| 1090 | C_SWITCH_X_SYSTEM | 1090 | GNUSTEP_CFLAGS |
| 1091 | C_SWITCH_X_SITE | 1091 | C_SWITCH_X_SITE |
| 1092 | LD_SWITCH_X_SITE | 1092 | LD_SWITCH_X_SITE |
| 1093 | gameuser | 1093 | gameuser |
| @@ -13413,7 +13413,7 @@ fi | |||
| 13413 | 13413 | ||
| 13414 | 13414 | ||
| 13415 | 13415 | ||
| 13416 | C_SWITCH_X_SYSTEM= | 13416 | GNUSTEP_CFLAGS= |
| 13417 | ### Use NeXTstep API to implement GUI. | 13417 | ### Use NeXTstep API to implement GUI. |
| 13418 | if test "${HAVE_NS}" = "yes"; then | 13418 | if 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 |