Author: rmottola
Date: Thu Mar 10 22:42:40 2016
New Revision: 39523
URL: http://svn.gna.org/viewcvs/gnustep?rev=39523&view=rev
Log:
Inherit CC and CXX compiler settings
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/Inspector/configure
apps/gworkspace/trunk/Inspector/configure.ac
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39523&r1=39522&r2=39523&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Thu Mar 10 22:42:40 2016
@@ -1,3 +1,11 @@
+2016-03-10 Riccardo Mottola <[email protected]>
+
+ * Inspector/aclocal.m4 (AC_CHECK_PDFKIT)
+ Fix redundant []
+
+ * Inspector/configure.ac
+ Inherit CC and CXX compiler settings.
+
2016-03-10 Riccardo Mottola <[email protected]>
* FSNode/FSNodeRepIcons.m (iconOfSize: forNode:)
Modified: apps/gworkspace/trunk/Inspector/configure
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/configure?rev=39523&r1=39522&r2=39523&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/configure (original)
+++ apps/gworkspace/trunk/Inspector/configure Thu Mar 10 22:42:40 2016
@@ -2099,8 +2099,17 @@
fi
#--------------------------------------------------------------------
-# Use config.guess, config.sub and install-sh provided by gnustep-make
+# 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'
@@ -2890,7 +2899,6 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3027,6 +3035,17 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
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
+
+#--------------------------------------------------------------------
+# Use config.guess, config.sub and install-sh provided by gnustep-make
+#--------------------------------------------------------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long
lines and -e" >&5
@@ -3556,7 +3575,7 @@
int
main ()
{
-[[PDFDocument class]];
+[PDFDocument class];
;
return 0;
}
Modified: apps/gworkspace/trunk/Inspector/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/configure.ac?rev=39523&r1=39522&r2=39523&view=diff
==============================================================================
--- apps/gworkspace/trunk/Inspector/configure.ac (original)
+++ apps/gworkspace/trunk/Inspector/configure.ac Thu Mar 10 22:42:40 2016
@@ -3,6 +3,27 @@
if test -z "$GNUSTEP_MAKEFILES"; then
AC_MSG_ERROR([You must set GNUSTEP_MAKEFILES or run the GNUstep
initialization script first!])
+fi
+
+#--------------------------------------------------------------------
+# 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
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
#--------------------------------------------------------------------
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
