/hg/icedtea-web: Removed gcc if native plugin is not build

[jvanek at icedtea.classpath.org]

changeset b1c291e04ae0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b1c291e04ae0
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Oct 18 13:08:54 2018 +0200

	Removed gcc if native plugin is not build
	* acinclude.m4: AC_PROG_CC and AC_PROG_CXX moved behind enable_native_plugin condition
	* configure.ac: AC_PROG_CC and AC_PROG_CXX moved behind enable_native_plugin condition, Faked fastDepC variables otherwise configure always fell
	* Makefile.am: plugin native tests made passing without plugin


diffstat:

 ChangeLog    |   8 ++++++++
 Makefile.am  |  22 ++++++++++++++++++++--
 acinclude.m4 |   2 ++
 configure.ac |  16 ++++++++++++++--
 4 files changed, 44 insertions(+), 4 deletions(-)

diffs (108 lines):

diff -r ae243b9d535c -r b1c291e04ae0 ChangeLog
--- a/ChangeLog	Wed Oct 17 18:36:08 2018 +0200
+++ b/ChangeLog	Thu Oct 18 13:08:54 2018 +0200
@@ -1,3 +1,11 @@
+2018-10-18  Jiri Vanek <jvanek at redhat.com>
+
+	Removed gcc if native plugin is not build
+	* acinclude.m4: AC_PROG_CC and AC_PROG_CXX moved behind enable_native_plugin condition
+	* configure.ac: AC_PROG_CC and AC_PROG_CXX moved behind enable_native_plugin condition, Faked fastDepC variables
+	otherwise configure always fell
+	* Makefile.am: plugin native tests made passing without plugin
+
 2018-10-17  Jiri Vanek <jvanek at redhat.com>
             Alex Kashchenko <akashche at redhat.com>
 
diff -r ae243b9d535c -r b1c291e04ae0 Makefile.am
--- a/Makefile.am	Wed Oct 17 18:36:08 2018 +0200
+++ b/Makefile.am	Thu Oct 18 13:08:54 2018 +0200
@@ -231,6 +231,13 @@
 export COVERABLE_PLUGIN_DIR=$(TESTS_DIR)/icedteanp-build-with-jacoco
 endif
 
+if ENABLE_NATIVE_PLUGIN
+  CPPUNIT_IMPL = run-cpp-unit-tests-impl
+  CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-impl
+else
+  CPPUNIT_IMPL = run-cpp-unit-tests-impl-placeholder
+  CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-placeholder
+endif
 
 if CP_SUPPORTS_REFLINK
   REFLINK = --reflink=auto
@@ -627,12 +634,12 @@
 	  $(CPP_UNITTEST_FRAMEWORK_LIB)\
 	  $(BUILT_CPP_UNIT_TEST_FRAMEWORK) -o $@
 
-clean-cpp-unit-tests: 
+clean-cpp-unit-tests-impl: 
 	rm -f stamps/cpp-unit-tests-compile.stamp
 	rm -f $(CPP_UNITTEST_EXECUTABLE)
 	rm -f $(CPP_UNITTEST_DIR)/*.o
 
-run-cpp-unit-tests: $(CPP_UNITTEST_EXECUTABLE)
+run-cpp-unit-tests-impl: $(CPP_UNITTEST_EXECUTABLE)
 	$(CPP_UNITTEST_EXECUTABLE)
 
 # End of CPP Unit test targets
@@ -648,6 +655,17 @@
 	fi
 endif
 
+clean-cpp-unit-tests-placeholder:
+	echo "plugin disabled"
+
+run-cpp-unit-tests-impl-placeholder:
+	echo "plugin disabled"
+
+clean-cpp-unit-tests: $(CPPUNIT_IMPL)
+
+run-cpp-unit-tests: $(CPPUNIT_CLEAN_IMPL)
+
+
 stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET)
 	mkdir -p stamps
 	touch stamps/plugin.stamp
diff -r ae243b9d535c -r b1c291e04ae0 acinclude.m4
--- a/acinclude.m4	Wed Oct 17 18:36:08 2018 +0200
+++ b/acinclude.m4	Thu Oct 18 13:08:54 2018 +0200
@@ -418,6 +418,8 @@
 dnl FIXME: use unstable
 AC_REQUIRE([IT_CHECK_NATIVE_PLUGIN])
 if test "x${enable_native_plugin}" = "xyes" ; then
+  AC_PROG_CC
+  AC_PROG_CXX
   PKG_CHECK_MODULES(GLIB, glib-2.0)
   AC_SUBST(GLIB_CFLAGS)
   AC_SUBST(GLIB_LIBS)
diff -r ae243b9d535c -r b1c291e04ae0 configure.ac
--- a/configure.ac	Wed Oct 17 18:36:08 2018 +0200
+++ b/configure.ac	Thu Oct 18 13:08:54 2018 +0200
@@ -13,8 +13,6 @@
 AC_SUBST(abs_top_srcdir)
 
 AC_CANONICAL_HOST
-AC_PROG_CC
-AC_PROG_CXX
 IT_SET_ARCH_SETTINGS
 
 IT_CP_SUPPORTS_REFLINK
@@ -211,4 +209,18 @@
 AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
 AC_CONFIG_FILES([build.properties])
 
+# this is nasty hack to make GCC trully optional
+echo -n "destroying gcc config? ... "
+if test "x${enable_native_plugin}" = "xno" ; then
+am__fastdepCC_TRUE="#"
+am__fastdepCC_FALSE="#"
+am__fastdepCC="#"
+am__fastdepCXX_TRUE="#"
+am__fastdepCXX_FALSE="#"
+am__fastdepCXX="#"
+echo "destroyed!"
+else
+echo "no"
+fi 
+
 AC_OUTPUT