Mercurial > emacs
changeset 110868:57f13c5d17f2
* configure.in: Combine some conditionals.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 08 Oct 2010 19:16:38 -0700 |
| parents | 239dd45a7dac |
| children | 3684139b9255 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 15 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 08 19:13:20 2010 -0700 +++ b/ChangeLog Fri Oct 08 19:16:38 2010 -0700 @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris <rgm@gnu.org> + * configure.in: Combine some conditionals. + * configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi. * make-dist: Include doc/emacs/*.texi.in.
--- a/configure.in Fri Oct 08 19:13:20 2010 -0700 +++ b/configure.in Fri Oct 08 19:16:38 2010 -0700 @@ -850,14 +850,12 @@ dnl Add our options to ac_link now, after it is set up. -if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x -then - ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" -fi - -if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x -then - ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" +if test x$GCC = xyes; then + test "x$GCC_LINK_TEST_OPTIONS" != x && \ + ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" +else + test "x$NON_GCC_LINK_TEST_OPTIONS" != x && \ + ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" fi dnl We need -znocombreloc if we're using a relatively recent GNU ld. @@ -867,7 +865,7 @@ dnl if not built to support GNU ld. late_LDFLAGS=$LDFLAGS -if test "$GCC" = yes; then +if test x$GCC = xyes; then LDFLAGS="$LDFLAGS -Wl,-znocombreloc" else LDFLAGS="$LDFLAGS -znocombreloc" @@ -3540,17 +3538,14 @@ #include config_opsysfile #include config_machfile -/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. - (There is probably a better place to do this, but right now the Cocoa - side does this in s/darwin.h and we cannot - parallel this exactly since GNUstep is multi-OS. */ -#ifdef HAVE_NS -# ifdef NS_IMPL_GNUSTEP /* GNUstep needs a bit more pure memory. Of the existing knobs, -SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. + (There is probably a better place to do this, but right now the + Cocoa side does this in s/darwin.h and we cannot parallel this + exactly since GNUstep is multi-OS. */ +#if defined HAVE_NS && defined NS_IMPL_GNUSTEP # define SYSTEM_PURESIZE_EXTRA 30000 -# endif /* NS_IMPL_GNUSTEP */ -#endif /* HAVE_NS */ +#endif /* SIGTYPE is the macro we actually use. */ #ifndef SIGTYPE