Changeset 831 for plugins/base1/se.lu.thep.wenni/trunk/configure.ac

Timestamp:

Nov 27, 2008, 11:22:45 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Removed bindir and cleaned up indentation.

File:

• plugins/base1/se.lu.thep.wenni/trunk/configure.ac (modified) (5 diffs)

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

@@ -53 +53 @@
 CPPFLAGS="-DHAVE_INLINE=1"
 AC_ARG_ENABLE(debug,
-  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
-  [CXXFLAGS="$CXXFLAGS -g -O"],
-  [CXXFLAGS="$CXXFLAGS -O3" 
-   CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"])
+              [ AS_HELP_STRING([--enable-debug],
+                               [turn on debug options and code]) ],
+              [ CXXFLAGS="$CXXFLAGS -g -O" ],
+              [ CXXFLAGS="$CXXFLAGS -O3"
+                CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF" ])
 
 AC_ARG_ENABLE(state,
-  [AS_HELP_STRING([--enable-state],
-  [stand-alone, base1, or base2 [default=base2]])],
-  [ if test "x$enableval" = "xstand-alone" ; then
-       state=stand-alone
-    elif test "x$enableval" = "xbase1" ; then
-      state=base1
-    elif test "x$enableval" = "xbase2" ; then
-      state=base2
-    else
-      echo
-      echo "Error!"
-      echo "Unknown value for `--enable-state'"
-      echo "allowed values are: `base2', `base1', and `stand-alone'"
-      exit -1
-   fi
- ],
- [state=base2]
-  )
+              [ AS_HELP_STRING([--enable-state],
+                               [stand-alone, base1, or base2 [default=base2]])],
+              [ if test "x$enableval" = "xstand-alone" ; then
+                    state=stand-alone
+                elif test "x$enableval" = "xbase1" ; then
+                    state=base1
+                elif test "x$enableval" = "xbase2" ; then
+                    state=base2
+                else
+                    echo
+                    echo "Error!"
+                    echo "Unknown value for `--enable-state'"
+                    echo "allowed values are: `base2', `base1', or `stand-alone'"
+                    exit -1
+                fi ],
+              [ state=base2 ])
 
 AM_CONDITIONAL([BASE1], [test x$state = xbase1])
@@ -104 +103 @@
   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;
@@ -116 +114 @@
   AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2Core.jar], [],
                 [AC_MSG_FAILURE([cannot find BASE2Core.jar])])
-  JAVACFLAGS=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar             
+  JAVACFLAGS=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar
   AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar], [],
                 [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])])
-  JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"  
-  bindir="$PLUGINDIR"
+  JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"
   AC_SUBST(JAVACFLAGS)
 fi
@@ -130 +127 @@
 AC_SEARCH_LIBS(sqrt, m)
 AC_SEARCH_LIBS(ATL_ctrsv, atlas, [LIBS="-lcblas $LIBS"],
-  AC_SEARCH_LIBS(cblas_sdsdot, gslcblas))
+               AC_SEARCH_LIBS(cblas_sdsdot, gslcblas))
 AC_SEARCH_LIBS(gsl_vector_alloc, gsl)
 
@@ -172 +169 @@
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([ WeNNI package will be installed in])
-AC_MSG_NOTICE([ $bindir])
+AC_MSG_NOTICE([    $PLUGINDIR ])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([ The following libs and flags will be used:])