Changeset 843

Timestamp:

Dec 1, 2008, 10:35:40 AM (13 years ago)

Author:

Jari Häkkinen

Message:

Fixed indentation issues and outputting more information to user.

File:

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

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 Peter Johansson
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of WeNNI,
@@ -58 +58 @@
 AM_CPPFLAGS="-DHAVE_INLINE=1"
 AC_ARG_ENABLE(debug,
-              [ AS_HELP_STRING([--enable-debug],
-                               [turn on debug options and code]) ],
+              [AS_HELP_STRING([--enable-debug],
+                              [turn on debug options and code])],
               [AM_CXXFLAGS="$AM_CXXFLAGS -g -O"],
               [AM_CXXFLAGS="$AM_CXXFLAGS -O3"
@@ -65 +65 @@
 
 AC_ARG_ENABLE(state,
-              [ AS_HELP_STRING([--enable-state],
-                               [stand-alone, base1, or base2 [default=base2]])],
+              [AS_HELP_STRING([--enable-state],
+                              [stand-alone, base1, or base2 [default=base2]])],
               [ if test "x$enableval" = "xstand-alone" ; then
                     state="stand-alone"
@@ -83 +83 @@
 AM_CONDITIONAL([BASE2], [test x$state = xbase2])
 
-AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR]), 
-                     [root directory for base installation])],
+AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR], 
+                                    [root directory for base installation])],
             [BASEDIR=$withval],[BASEDIR=/usr/local/base])
 
 AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
-                      [root directory for base plug-ins])],
+                                      [root directory for base plug-ins])],
             [PLUGINDIR=$withval],
             [if (test x$state = xbase1); then
@@ -98 +98 @@
 if (test x$state = xbase1); then
   # check for BASE1 API
-  OLD_CPPFLAGS=$CPPFLAGS;
-  OLD_LDFLAGS=$LDFLAGS;
+  save_CPPFLAGS=$CPPFLAGS;
+  save_LDFLAGS=$LDFLAGS;
   LDFLAGS="$LDFLAGS -L$BASEDIR/lib"
   AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib"],
@@ -106 +106 @@
   AC_CHECK_HEADERS([basefile.h],[BASECPPFLAGS=-I$BASEDIR/include/cxx],
                [AC_MSG_FAILURE([cannot find base header files])])
-  CPPFLAGS=$OLD_CPPFLAGS;
-  LDFLAGS=$OLD_LDFLAGS;
+  CPPFLAGS=$save_CPPFLAGS;
+  LDFLAGS=$save_LDFLAGS;
   AC_SUBST(BASECPPFLAGS)
   AC_SUBST(BASELDFLAGS)
@@ -186 +186 @@
 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([  LIBS        =\"$LIBS\"])
+AC_MSG_NOTICE([  CPPFLAGS     = $CPPFLAGS $AM_CPPFLAGS])
+AC_MSG_NOTICE([  CXXFLAGS     = $CXXFLAGS $AM_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\"])
+  AC_MSG_NOTICE([  BASECPPFLAGS = $BASECPPFLAGS])
+  AC_MSG_NOTICE([  BASELDFLAGS  = $BASELDFLAGS])
 fi
 if (test x$state = xbase2); then