minor autoconf tweak

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38491 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-05-13 10:57:56 +00:00
parent 918fbdd6b0
commit 0a526fad04
3 changed files with 19167 additions and 3287 deletions

View file

@ -1,3 +1,9 @@
2015-05-13 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Tidy compiler and preprocessor detection and use
warning for potentially broken compiler selection.
* configure: regenerate
2015-05-13 Richard Frith-Macdonald <rfm@gnu.org>
* Version:

22422
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -1048,24 +1048,34 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LOCAL_LIBRARIES -L$GNUSTEP_NETWORK_LIBRARIES -L$GNU
#--------------------------------------------------------------------
# Find the compiler
#--------------------------------------------------------------------
MAKECC=`gnustep-config --variable=CC`
MAKECPP=`gnustep-config --variable=CPP`
MAKECXX=`gnustep-config --variable=CXX`
if test "$CC" = ""; then
CC=`gnustep-config --variable=CC`
CC=$MAKECC
else
if test "$CC" != "$MAKECC"; then
AC_MSG_WARN([You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run the gnustep-base configure again with your CC environment variable set to $MAKECC])
fi
fi
if test "$CPP" = ""; then
CPP=`gnustep-config --variable=CPP`
CPP=$MAKECPP
else
if test "$CPP" != "$MAKECPP"; then
AC_MSG_WARN([You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP). To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CPP or run the gnustep-base configure again with your CPP environment variable set to $MAKECPP])
fi
fi
if test "$CXX" = ""; then
CXX=`gnustep-config --variable=CXX`
CXX=$MAKECXX
else
if test "$CXX" != "$MAKECXX"; then
AC_MSG_WARN([You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX). To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CXX or run the gnustep-base configure again with your CXX environment variable set to $MAKECXX])
fi
fi
AC_PROG_CC
AC_PROG_CPP
AC_USE_SYSTEM_EXTENSIONS
MAKECC=`gnustep-config --variable=CC`
if test "$CC" != "$MAKECC"; then
AC_MSG_ERROR([You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). Please run configure again with your environment set to match your gnustep-make])
exit 1
fi
# Large file support needed by NSData/NSFileHandle.
# These macros must be called after AC_USE_SYSTEM_EXTENSIONS because