Changeset 821

Timestamp:

Nov 25, 2008, 5:38:07 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Build of stand-alone and base1 modes work. base2 still to be finalized.

Location:

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

Files:

• base/base1/BaseFileConverter/Makefile.am (modified) (1 diff)
• base/base2/Makefile.am (modified) (1 diff)
• configure.ac (modified) (6 diffs)

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

@@ -26 +26 @@
 bin_PROGRAMS = BaseFileConverter
 
-AM_CPPFLAGS = -I@top_srcdir@/lib 
+AM_CPPFLAGS = $(BASECPPFLAGS) -I@top_srcdir@/lib
 
-LDADD = -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools
+LDADD = $(BASELDFLAGS) -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools 
 
 BaseFileConverter_SOURCES = BaseFileConverter.cc Clone.cc Data.cc Parameter.cc

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

@@ -27 +27 @@
 BUILDDIR = $(TOPBUILDDIR)/$(SUBDIR)
 
-JAVA = RunBinaryPlugin.java WeNNI.java 
+JAVA = WeNNI.java 
 CLASS = $(JAVA:.java=.class)
 JAR  = WeNNI.jar

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

@@ -5 +5 @@
 # Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2008 Jari Häkkinen
 #
 # This file is part of WeNNI,
@@ -39 +40 @@
 AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
+
+# Set default programming language
+AC_LANG(C++)
 
 # Checks for programs.
@@ -79 +83 @@
 
 AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR]), 
-                     root directory for base installation]],
+                     [root directory for base installation])],
             [BASEDIR=$withval],[BASEDIR=/usr/local/base])
-AC_SUBST(BASEDIR)        
 
 AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
@@ -92 +95 @@
              fi])
 
-
 if (test x$state = xbase1); then
-  LDFLAGS="-L$BASEDIR/BASE-plugindevkit/bogus_base/lib"
-  AC_SEARCH_LIBS([base_finite], [base], , 
-                 [AC_MSG_FAILURE([cannot find base library])])
-  CPPFLAGS="-I$BASEDIR/BASE-plugindevkit/bogus_base/include/cxx $CPPFLAGS"
-  AC_CHECK_HEADERS([basefile.h])
+  OLD_CPPFLAGS=$CPPFLAGS;
+  OLD_LDFLAGS=$LDFLAGS;
+  LDFLAGS="-L$BASEDIR/lib"
+  AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib -lbase"],
+               [AC_MSG_FAILURE([cannot find base library])])
+  CPPFLAGS="-I$BASEDIR/include/cxx $CPPFLAGS"
+  AC_CHECK_HEADERS([basefile.h],[BASECPPFLAGS=-I$BASEDIR/include/cxx],
+               [AC_MSG_FAILURE([cannot find base header files])])
   bindir="$PLUGINDIR"
+  CPPFLAGS=$OLD_CPPFLAGS;
+  LDFLAGS=$OLD_LDFLAGS;
+  AC_SUBST(BASECPPFLAGS)
+  AC_SUBST(BASELDFLAGS)
 fi
 if (test x$state = xbase2); then
@@ -109 +118 @@
   JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"  
   bindir="$PLUGINDIR"
+  AC_SUBST(JAVACFLAGS)
 fi
-AC_SUBST(JAVACFLAGS)
-
 
 AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])],
@@ -165 +173 @@
 AC_MSG_NOTICE([ The following libs and flags will be used:])
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
-AC_MSG_NOTICE([  CPPFLAGS=\"$CPPFLAGS\"])
-AC_MSG_NOTICE([  CXXFLAGS=\"$CXXFLAGS\"])
-AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
+AC_MSG_NOTICE([  CPPFLAGS    =\"$CPPFLAGS\"])
+AC_MSG_NOTICE([  CXXFLAGS    =\"$CXXFLAGS\"])
+AC_MSG_NOTICE([  LDFLAGS     =\"$LDFLAGS\"])
+AC_MSG_NOTICE([  LIBS        =\"$LIBS\"])
+if (test x$state = xbase1); then
+  AC_MSG_NOTICE([  BASECPPFLAGS=\"$BASECPPFLAGS\"])
+  AC_MSG_NOTICE([  BASELDFLAGS =\"$BASELDFLAGS\"])
+fi
 if (test x$state = xbase2); then
   AC_MSG_NOTICE([  JAVACFLAGS=\"$JAVACFLAGS\"])
 fi
-AC_MSG_NOTICE([  LIBS=\"$LIBS\"])
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([])