Mercurial > emacs
changeset 99101:438a7c275cf3
Yavor Doganov <yavor at gnu.org> (tiny change)
Use `.' instead of `source' to source GNUstep.conf.
Exit with an error if `--with-ns' was specified but <AppKit/AppKit.h>
is not found. (Bug#1230)
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 24 Oct 2008 04:26:44 +0000 |
| parents | bdf3b24112a2 |
| children | 2a251a9f1f85 |
| files | configure.in |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Oct 24 04:22:14 2008 +0000 +++ b/configure.in Fri Oct 24 04:26:44 2008 +0000 @@ -1239,15 +1239,17 @@ ns_appbindir=`pwd`/nextstep/Emacs.app ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" - GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" - GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" + GNUSTEP_MAKEFILES="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" + GNUSTEP_SYSTEM_HEADERS="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" + GNUSTEP_SYSTEM_LIBRARIES="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" fi - AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes) + AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], + [AC_MSG_ERROR([`--with-ns' was specified, but the include + files are missing or cannot be compiled.])]) NS_HAVE_NSINTEGER=yes AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>], [NSInteger i;])],