Changeset 860

Timestamp:

Dec 2, 2008, 9:31:43 PM (13 years ago)

Author:

Peter Johansson

Message:

adding tests for javac and jar - refs #153

Location:

plugins/base1/se.lu.thep.wenni/trunk

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• m4 (added)
• m4/ac_prog_jar.m4 (added)
• m4/ac_prog_javac.m4 (added)
• m4/ac_prog_javac_works.m4 (added)

plugins/base1/se.lu.thep.wenni/trunk/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2007 Peter Johansson
-# Copyright (C) 2008 Jari Häkkinen
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of WeNNI,
@@ -22 +22 @@
 # You should have received a copy of the GNU General Public License
 # along with WeNNI. If not, see <http://www.gnu.org/licenses/>.
+
+# -I arg should be the same as arg in AC_CONFIG_MACRO_DIR in configure.ac
+ACLOCAL_AMFLAGS = -I m4 --install
 
 SUBDIRS = lib bin data

plugins/base1/se.lu.thep.wenni/trunk/configure.ac

@@ -35 +35 @@
 AC_CONFIG_AUX_DIR([autotools])
 AC_PREFIX_DEFAULT([/usr/local])
+AC_CONFIG_MACRO_DIR([m4])
 
 # Build configuration parameters, change only if you know what you do
@@ -132 +133 @@
   AC_CONFIG_FILES([base/base1/base_plugin_script/plugin_WeNNI.base])
 elif (test x$state = xbase2); then
+  AC_PROG_JAVAC   
+  AC_PROG_JAR   
   if (test $DOWNLOADBASE2API = false); then
     AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2Core.jar], [],
@@ -188 +191 @@
 AC_OUTPUT
 
+
 # Some more messages.
 AC_MSG_NOTICE([])