Author: rmottola Date: Wed May 13 23:04:52 2015 New Revision: 38494 URL: http://svn.gna.org/viewcvs/gnustep?rev=38494&view=rev Log: Copied from base: only warn if compiler is different from the one configured in make
Modified: libs/back/trunk/ChangeLog libs/back/trunk/configure libs/back/trunk/configure.ac Modified: libs/back/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/ChangeLog?rev=38494&r1=38493&r2=38494&view=diff ============================================================================== --- libs/back/trunk/ChangeLog (original) +++ libs/back/trunk/ChangeLog Wed May 13 23:04:52 2015 @@ -1,3 +1,10 @@ +2015-05-13 Riccardo Mottola <r...@gnu.org> + + * configure.ac + Copied from base: only warn if compiler is different from the one configured in make + * configure + regenerated + 2015-05-12 Riccardo Mottola <r...@gnu.org> * configure.ac Modified: libs/back/trunk/configure URL: http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/configure?rev=38494&r1=38493&r2=38494&view=diff ============================================================================== --- libs/back/trunk/configure (original) +++ libs/back/trunk/configure Wed May 13 23:04:52 2015 @@ -2331,14 +2331,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' @@ -3266,12 +3296,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 #-------------------------------------------------------------------- # The following is so that headers and custom libraries Modified: libs/back/trunk/configure.ac URL: http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/configure.ac?rev=38494&r1=38493&r2=38494&view=diff ============================================================================== --- libs/back/trunk/configure.ac (original) +++ libs/back/trunk/configure.ac Wed May 13 23:04:52 2015 @@ -52,23 +52,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 #-------------------------------------------------------------------- # The following is so that headers and custom libraries _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs