Author: rmottola
Date: Wed May 13 23:04:45 2015
New Revision: 38493
URL: http://svn.gna.org/viewcvs/gnustep?rev=38493&view=rev
Log:
Copied from base: only warn if compiler is different from the one configured in
make
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/configure
libs/gui/trunk/configure.ac
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38493&r1=38492&r2=38493&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Wed May 13 23:04:45 2015
@@ -1,3 +1,10 @@
+2015-05-13 Riccardo Mottola <[email protected]>
+
+ * configure.ac
+ Copied from base: only warn if compiler is different from the one
configured in make
+ * configure
+ regenerated
+
2015-05-12 Riccardo Mottola <[email protected]>
* configure.ac
Modified: libs/gui/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/configure?rev=38493&r1=38492&r2=38493&view=diff
==============================================================================
--- libs/gui/trunk/configure (original)
+++ libs/gui/trunk/configure Wed May 13 23:04:45 2015
@@ -2391,14 +2391,44 @@
#--------------------------------------------------------------------
# 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running
configure with the compiler ($CC) set to a different value from that used by
gnustep-make ($MAKECC). To a
+void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run
the gnustep-base configure again with your CC environment var
+iable set to $MAKECC" >&5
+$as_echo "$as_me: WARNING: You are running configure with the compiler ($CC)
set to a different value from that used by gnustep-make ($MAKECC). To a
+void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run
the gnustep-base configure again with your CC environment var
+iable set to $MAKECC" >&2;}
+ fi
fi
if test "$CPP" = ""; then
- CPP=`gnustep-config --variable=CPP`
+ CPP=$MAKECPP
+else
+ if test "$CPP" != "$MAKECPP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 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 environ
+ment variable set to $MAKECPP" >&5
+$as_echo "$as_me: WARNING: 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 environ
+ment variable set to $MAKECPP" >&2;}
+ fi
fi
if test "$CXX" = ""; then
- CXX=`gnustep-config --variable=CXX`
+ CXX=$MAKECXX
+else
+ if test "$CXX" != "$MAKECXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 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" >&5
+$as_echo "$as_me: WARNING: 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" >&2;}
+ fi
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3326,12 +3356,6 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-MAKECC=`gnustep-config --variable=CC`
-if test "$CC" != "$MAKECC"; then
- as_fn_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" "$LINENO" 5
- exit 1
-fi
#--------------------------------------------------------------------
# Add target OS directories as necessary
Modified: libs/gui/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/configure.ac?rev=38493&r1=38492&r2=38493&view=diff
==============================================================================
--- libs/gui/trunk/configure.ac (original)
+++ libs/gui/trunk/configure.ac Wed May 13 23:04:45 2015
@@ -54,23 +54,38 @@
#--------------------------------------------------------------------
# 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 a
+void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run
the gnustep-base configure again with your CC environment var
+iable 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 environ
+ment 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
-
-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
#--------------------------------------------------------------------
# Add target OS directories as necessary
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
