diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-11 06:17:27 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-11 06:17:27 -0400 |
| commit | f867f9971dff3ea37fb8a5d369341d65522694ff (patch) | |
| tree | 4974767f6fbfbeb450fead903e9f5ef090810933 /autogen | |
| parent | d57de7fe59decee7ac865ee0af7f658610bc890a (diff) | |
| download | emacs-f867f9971dff3ea37fb8a5d369341d65522694ff.tar.gz | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -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@ C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ C_SWITCH_X_SITE = @C_SWITCH_X_SITE@ -C_SWITCH_X_SYSTEM = @C_SWITCH_X_SYSTEM@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -332,6 +331,7 @@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCTOMB = @GNULIB_WCTOMB@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ +GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@ GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ GREP = @GREP@ 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 S_FILE M_FILE X_TOOLKIT_TYPE -C_SWITCH_X_SYSTEM +GNUSTEP_CFLAGS C_SWITCH_X_SITE LD_SWITCH_X_SITE gameuser @@ -13413,7 +13413,7 @@ fi -C_SWITCH_X_SYSTEM= +GNUSTEP_CFLAGS= ### Use NeXTstep API to implement GUI. if test "${HAVE_NS}" = "yes"; then @@ -13430,7 +13430,7 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h # See also .m.o rule in Makefile.in */ # FIXME: are all these flags really needed? Document here why. */ - C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" ## Extra CFLAGS applied to src/*.m files. 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" fi |