[RFC 1/2 v2] PR1176: Added --with-cacao-src-dir option

[Stefan Ring]

https://bitbucket.org/Ringdingcoder/icedtea7/commits/bd37843206b21eff8a9a2b94de2f169936ed6a41

diff -r 1a8e93b7fe96 -r bd37843206b2 ChangeLog
--- a/ChangeLog	Wed Dec 19 18:38:08 2012 +0000
+++ b/ChangeLog	Thu Dec 20 16:41:31 2012 +0100
@@ -1,3 +1,16 @@
+2012-12-20  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	PR1176: Added --with-cacao-src-dir option
+	* acinclude.m4:
+	(IT_WITH_CACAO_SRC_DIR): Brought in line with local customs.
+
+	Transplant of
+	2009-10-01 Robert Schuster <robertschuster at fsfe.org>
+
+	* configure.ac: Added --with-cacao-src-dir option.
+	* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR.
+	* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used.
+
 2010-09-24  Andrew John Hughes  <gnu.andrew at redhat.com>

 	* Makefile.am:
diff -r 1a8e93b7fe96 -r bd37843206b2 Makefile.am
--- a/Makefile.am	Wed Dec 19 18:38:08 2012 +0000
+++ b/Makefile.am	Thu Dec 20 16:41:31 2012 +0100
@@ -1077,6 +1077,8 @@
 stamps/download-cacao.stamp:
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+else
 if USE_ALT_CACAO_SRC_ZIP
 	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
 endif
@@ -1098,6 +1100,7 @@
 	fi
 endif
 endif
+endif
 	mkdir -p stamps
 	touch $@

@@ -1277,6 +1280,14 @@
 stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+	set -e ; \
+	if ! test -d cacao ; \
+	then \
+	  mkdir -p cacao/cacao ; \
+	  cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+	fi
+else
 	set -e ; \
 	if ! test -d cacao/cacao ; \
 	then \
@@ -1289,6 +1300,7 @@
 	fi
 endif
 endif
+endif
 	mkdir -p stamps
 	touch $@

diff -r 1a8e93b7fe96 -r bd37843206b2 acinclude.m4
--- a/acinclude.m4	Wed Dec 19 18:38:08 2012 +0000
+++ b/acinclude.m4	Thu Dec 20 16:41:31 2012 +0100
@@ -805,7 +805,7 @@
       AC_MSG_ERROR([Invalid CACAO source zip specified: ${ALT_CACAO_SRC_ZIP}])
     fi
   ],
-  [
+  [
     ALT_CACAO_SRC_ZIP="not specified"
   ])
   AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test "x${ALT_CACAO_SRC_ZIP}"
!= "xnot specified")
@@ -813,6 +813,27 @@
   AC_SUBST(ALT_CACAO_SRC_ZIP)
 ])

+AC_DEFUN([IT_WITH_CACAO_SRC_DIR],
+[
+  AC_MSG_CHECKING(for a CACAO source directory)
+  AC_ARG_WITH([cacao-src-dir],
+              [AS_HELP_STRING(--with-cacao-src-dir,specify the
location of the CACAO sources)],
+  [
+    ALT_CACAO_SRC_DIR=${withval}
+    if test "x${ALT_CACAO_SRC_DIR}" = "xno"; then
+      ALT_CACAO_SRC_DIR="not specified"
+    elif ! test -d ${ALT_CACAO_SRC_DIR} ; then
+      AC_MSG_ERROR([Invalid CACAO source dir specified: ${ALT_CACAO_SRC_DIR}])
+    fi
+  ],
+  [
+    ALT_CACAO_SRC_DIR="not specified"
+  ])
+  AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test "x${ALT_CACAO_SRC_DIR}"
!= "xnot specified")
+  AC_MSG_RESULT(${ALT_CACAO_SRC_DIR})
+  AC_SUBST(ALT_CACAO_SRC_DIR)
+])
+
 AC_DEFUN([IT_ENABLE_HG],
 [
   AC_REQUIRE([IT_WITH_PROJECT])
diff -r 1a8e93b7fe96 -r bd37843206b2 configure.ac
--- a/configure.ac	Wed Dec 19 18:38:08 2012 +0000
+++ b/configure.ac	Thu Dec 20 16:41:31 2012 +0100
@@ -140,6 +140,7 @@
 IT_ENABLE_CACAO
 IT_WITH_CACAO_HOME
 IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
 IT_ENABLE_JAMVM
 IT_WITH_JAMVM_SRC_ZIP