Changeset 843


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • plugins/base1/se.lu.thep.wenni/trunk/configure.ac

    r841 r843  
    55# Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
    66# Copyright (C) 2007 Peter Johansson
    7 # Copyright (C) 2008 Jari Häkkinen Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    88#
    99# This file is part of WeNNI,
     
    5858AM_CPPFLAGS="-DHAVE_INLINE=1"
    5959AC_ARG_ENABLE(debug,
    60               [ AS_HELP_STRING([--enable-debug],
    61                                [turn on debug options and code]) ],
     60              [AS_HELP_STRING([--enable-debug],
     61                              [turn on debug options and code])],
    6262              [AM_CXXFLAGS="$AM_CXXFLAGS -g -O"],
    6363              [AM_CXXFLAGS="$AM_CXXFLAGS -O3"
     
    6565
    6666AC_ARG_ENABLE(state,
    67               [ AS_HELP_STRING([--enable-state],
    68                                [stand-alone, base1, or base2 [default=base2]])],
     67              [AS_HELP_STRING([--enable-state],
     68                              [stand-alone, base1, or base2 [default=base2]])],
    6969              [ if test "x$enableval" = "xstand-alone" ; then
    7070                    state="stand-alone"
     
    8383AM_CONDITIONAL([BASE2], [test x$state = xbase2])
    8484
    85 AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR]),
    86                      [root directory for base installation])],
     85AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR],
     86                                    [root directory for base installation])],
    8787            [BASEDIR=$withval],[BASEDIR=/usr/local/base])
    8888
    8989AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
    90                       [root directory for base plug-ins])],
     90                                      [root directory for base plug-ins])],
    9191            [PLUGINDIR=$withval],
    9292            [if (test x$state = xbase1); then
     
    9898if (test x$state = xbase1); then
    9999  # check for BASE1 API
    100   OLD_CPPFLAGS=$CPPFLAGS;
    101   OLD_LDFLAGS=$LDFLAGS;
     100  save_CPPFLAGS=$CPPFLAGS;
     101  save_LDFLAGS=$LDFLAGS;
    102102  LDFLAGS="$LDFLAGS -L$BASEDIR/lib"
    103103  AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib"],
     
    106106  AC_CHECK_HEADERS([basefile.h],[BASECPPFLAGS=-I$BASEDIR/include/cxx],
    107107               [AC_MSG_FAILURE([cannot find base header files])])
    108   CPPFLAGS=$OLD_CPPFLAGS;
    109   LDFLAGS=$OLD_LDFLAGS;
     108  CPPFLAGS=$save_CPPFLAGS;
     109  LDFLAGS=$save_LDFLAGS;
    110110  AC_SUBST(BASECPPFLAGS)
    111111  AC_SUBST(BASELDFLAGS)
     
    186186AC_MSG_NOTICE([ The following libs and flags will be used:])
    187187AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
    188 AC_MSG_NOTICE([  CPPFLAGS    =\"$CPPFLAGS\"])
    189 AC_MSG_NOTICE([  CXXFLAGS    =\"$CXXFLAGS\"])
    190 AC_MSG_NOTICE([  LDFLAGS     =\"$LDFLAGS\"])
    191 AC_MSG_NOTICE([  LIBS        =\"$LIBS\"])
     188AC_MSG_NOTICE([  CPPFLAGS     = $CPPFLAGS $AM_CPPFLAGS])
     189AC_MSG_NOTICE([  CXXFLAGS     = $CXXFLAGS $AM_CXXFLAGS])
     190AC_MSG_NOTICE([  LDFLAGS      = $LDFLAGS])
     191AC_MSG_NOTICE([  LIBS         = $LIBS])
    192192if (test x$state = xbase1); then
    193   AC_MSG_NOTICE([  BASECPPFLAGS=\"$BASECPPFLAGS\"])
    194   AC_MSG_NOTICE([  BASELDFLAGS =\"$BASELDFLAGS\"])
     193  AC_MSG_NOTICE([  BASECPPFLAGS = $BASECPPFLAGS])
     194  AC_MSG_NOTICE([  BASELDFLAGS  = $BASELDFLAGS])
    195195fi
    196196if (test x$state = xbase2); then
Note: See TracChangeset for help on using the changeset viewer.