Author: stefanbidi Date: Thu Jul 7 03:16:45 2016 New Revision: 39962 URL: http://svn.gna.org/viewcvs/gnustep?rev=39962&view=rev Log: * configure, * configure.ac: Put CC/CXX test after checking for gnustep-config.
Modified: libs/corebase/trunk/ChangeLog libs/corebase/trunk/Documentation/CompilingApplications.dox (props changed) libs/corebase/trunk/Documentation/ConfiguringAndCompiling.dox (props changed) libs/corebase/trunk/Documentation/DoxygenLayout.xml (props changed) libs/corebase/trunk/Documentation/ExampleEXUInt32.dox (props changed) libs/corebase/trunk/Documentation/MainPage.dox (props changed) libs/corebase/trunk/Examples/EXUInt32.c (props changed) libs/corebase/trunk/Examples/EXUInt32.h (props changed) libs/corebase/trunk/configure libs/corebase/trunk/configure.ac Modified: libs/corebase/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/ChangeLog?rev=39962&r1=39961&r2=39962&view=diff ============================================================================== --- libs/corebase/trunk/ChangeLog (original) +++ libs/corebase/trunk/ChangeLog Thu Jul 7 03:16:45 2016 @@ -1,8 +1,10 @@ +2016-07-08 Stefan Bidigaray <stefanb...@gmail.com> + * configure, + * configure.ac: Put CC/CXX test after checking for gnustep-config. + 2015-09-23 Riccardo Mottola <r...@gnu.org> - - * configure.ac - * configure - Use gnustep make compilers if CC/CXX not overridden + * configure.ac, + * configure: Use gnustep make compilers if CC/CXX not overridden. 2015-07-12 Stefan Bidigaray <stefanb...@gmail.com> * Source/CFPropertyList.c: Fix string size bug. Propchange: libs/corebase/trunk/Documentation/CompilingApplications.dox ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Documentation/ConfiguringAndCompiling.dox ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Documentation/DoxygenLayout.xml ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Documentation/ExampleEXUInt32.dox ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Documentation/MainPage.dox ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Examples/EXUInt32.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: libs/corebase/trunk/Examples/EXUInt32.h ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Modified: libs/corebase/trunk/configure URL: http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure?rev=39962&r1=39961&r2=39962&view=diff ============================================================================== --- libs/corebase/trunk/configure (original) +++ libs/corebase/trunk/configure Thu Jul 7 03:16:45 2016 @@ -2190,15 +2190,6 @@ #-------------------------------------------------------------------- # Find the compiler #-------------------------------------------------------------------- -if test "$CC" = ""; then - CC=`gnustep-config --variable=CC` -fi -if test "$CPP" = ""; then - CPP=`gnustep-config --variable=CPP` -fi -if test "$CXX" = ""; then - CXX=`gnustep-config --variable=CXX` -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3126,15 +3117,6 @@ 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 diffe -rent 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 - - # Check for header files. @@ -4297,7 +4279,12 @@ if test x"$GNUSTEP_CONFIG" != "xno"; then : - OBJC_LIBS=`$GNUSTEP_CONFIG --base-libs` + 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 + OBJC_LIBS=`$GNUSTEP_CONFIG --base-libs` LIBS="$LIBS $OBJC_LIBS" $as_echo "#define HAVE_LIBOBJC 1" >>confdefs.h Modified: libs/corebase/trunk/configure.ac URL: http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure.ac?rev=39962&r1=39961&r2=39962&view=diff ============================================================================== --- libs/corebase/trunk/configure.ac (original) +++ libs/corebase/trunk/configure.ac Thu Jul 7 03:16:45 2016 @@ -9,26 +9,8 @@ #-------------------------------------------------------------------- # Find the compiler #-------------------------------------------------------------------- -if test "$CC" = ""; then - CC=`gnustep-config --variable=CC` -fi -if test "$CPP" = ""; then - CPP=`gnustep-config --variable=CPP` -fi -if test "$CXX" = ""; then - CXX=`gnustep-config --variable=CXX` -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 diffe -rent value from that used by gnustep-make ($MAKECC). Please run configure again with - your environment set to match your gnustep-make]) - exit 1 -fi - # Check for header files. AC_HEADER_STDC @@ -152,7 +134,12 @@ AS_IF([test "x$with_objc" != xno], [AC_PATH_PROG(GNUSTEP_CONFIG, [gnustep-config], [no]) AS_IF([test x"$GNUSTEP_CONFIG" != "xno"], - [OBJC_LIBS=`$GNUSTEP_CONFIG --base-libs` + [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 + OBJC_LIBS=`$GNUSTEP_CONFIG --base-libs` LIBS="$LIBS $OBJC_LIBS" AC_DEFINE(HAVE_LIBOBJC, 1)], [AC_CHECK_HEADER(objc/runtime.h) _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs