gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix error in gnutls define and add check for consistent compiler use

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34053 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-10-25 07:41:51 +00:00
parent 32cd99926f
commit a3ba553688
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-25 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: fix erroneous define of HAVE_GNUTLS to zero, and add
check for building with a different compiler from that used by make.
2011-10-24 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSAffineTransform.m (-initWithCoder:, encodeWithCoder:):
@ -14,7 +19,7 @@
2011-10-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/common.h: Attempt to workaroiund clang __blockproblem
* Source/common.h: Attempt to workaround clang __block problem
2011-10-20 Richard Frith-Macdonald <rfm@gnu.org>

11
configure vendored
View file

@ -5118,8 +5118,15 @@ _ACEOF
MAKECC=`gnustep-config --variable=CC`
if test "$CC" != "$MAKECC"; then
{ { $as_echo "$as_me:$LINENO: 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" >&5
$as_echo "$as_me: 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" >&2;}
{ (exit 1); exit 1; }; }
exit 1
fi
#--------------------------------------------------------------------
#-------------------------------------------------------------------r
# Check how to enable builtins for atomic operations
#--------------------------------------------------------------------
@ -23925,11 +23932,13 @@ else
$as_echo "$as_me: WARNING: Disabled support for TLS funtionality." >&2;}
HAVE_GNUTLS=0
fi
if test $HAVE_GNUTLS = 1; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GNUTLS $HAVE_GNUTLS
_ACEOF
fi
#--------------------------------------------------------------------

11
configure.ac
View file

@ -1017,8 +1017,13 @@ 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
#--------------------------------------------------------------------
#-------------------------------------------------------------------r
# Check how to enable builtins for atomic operations
#--------------------------------------------------------------------
@ -2809,7 +2814,9 @@ else
AC_MSG_WARN([Disabled support for TLS funtionality.])
HAVE_GNUTLS=0
fi
AC_DEFINE_UNQUOTED(HAVE_GNUTLS,$HAVE_GNUTLS,[Define if libgnutls available])
if test $HAVE_GNUTLS = 1; then
AC_DEFINE_UNQUOTED(HAVE_GNUTLS,$HAVE_GNUTLS,[Define if libgnutls available])
fi
AC_SUBST(HAVE_GNUTLS)
#--------------------------------------------------------------------