Changeset 831


Ignore:
Timestamp:
Nov 27, 2008, 11:22:45 PM (13 years ago)
Author:
Jari Häkkinen
Message:

Removed bindir and cleaned up indentation.

File:
1 edited

Legend:

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

    r827 r831  
    5353CPPFLAGS="-DHAVE_INLINE=1"
    5454AC_ARG_ENABLE(debug,
    55   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
    56   [CXXFLAGS="$CXXFLAGS -g -O"],
    57   [CXXFLAGS="$CXXFLAGS -O3"
    58    CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"])
     55              [ AS_HELP_STRING([--enable-debug],
     56                               [turn on debug options and code]) ],
     57              [ CXXFLAGS="$CXXFLAGS -g -O" ],
     58              [ CXXFLAGS="$CXXFLAGS -O3"
     59                CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF" ])
    5960
    6061AC_ARG_ENABLE(state,
    61   [AS_HELP_STRING([--enable-state],
    62   [stand-alone, base1, or base2 [default=base2]])],
    63   [ if test "x$enableval" = "xstand-alone" ; then
    64        state=stand-alone
    65     elif test "x$enableval" = "xbase1" ; then
    66       state=base1
    67     elif test "x$enableval" = "xbase2" ; then
    68       state=base2
    69     else
    70       echo
    71       echo "Error!"
    72       echo "Unknown value for `--enable-state'"
    73       echo "allowed values are: `base2', `base1', and `stand-alone'"
    74       exit -1
    75    fi
    76  ],
    77  [state=base2]
    78   )
     62              [ AS_HELP_STRING([--enable-state],
     63                               [stand-alone, base1, or base2 [default=base2]])],
     64              [ if test "x$enableval" = "xstand-alone" ; then
     65                    state=stand-alone
     66                elif test "x$enableval" = "xbase1" ; then
     67                    state=base1
     68                elif test "x$enableval" = "xbase2" ; then
     69                    state=base2
     70                else
     71                    echo
     72                    echo "Error!"
     73                    echo "Unknown value for `--enable-state'"
     74                    echo "allowed values are: `base2', `base1', or `stand-alone'"
     75                    exit -1
     76                fi ],
     77              [ state=base2 ])
    7978
    8079AM_CONDITIONAL([BASE1], [test x$state = xbase1])
     
    104103  AC_CHECK_HEADERS([basefile.h],[BASECPPFLAGS=-I$BASEDIR/include/cxx],
    105104               [AC_MSG_FAILURE([cannot find base header files])])
    106   bindir="$PLUGINDIR"
    107105  CPPFLAGS=$OLD_CPPFLAGS;
    108106  LDFLAGS=$OLD_LDFLAGS;
     
    116114  AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2Core.jar], [],
    117115                [AC_MSG_FAILURE([cannot find BASE2Core.jar])])
    118   JAVACFLAGS=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar             
     116  JAVACFLAGS=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar
    119117  AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar], [],
    120118                [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])])
    121   JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS" 
    122   bindir="$PLUGINDIR"
     119  JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"
    123120  AC_SUBST(JAVACFLAGS)
    124121fi
     
    130127AC_SEARCH_LIBS(sqrt, m)
    131128AC_SEARCH_LIBS(ATL_ctrsv, atlas, [LIBS="-lcblas $LIBS"],
    132   AC_SEARCH_LIBS(cblas_sdsdot, gslcblas))
     129               AC_SEARCH_LIBS(cblas_sdsdot, gslcblas))
    133130AC_SEARCH_LIBS(gsl_vector_alloc, gsl)
    134131
     
    172169AC_MSG_NOTICE([])
    173170AC_MSG_NOTICE([ WeNNI package will be installed in])
    174 AC_MSG_NOTICE([ $bindir])
     171AC_MSG_NOTICE([    $PLUGINDIR ])
    175172AC_MSG_NOTICE([])
    176173AC_MSG_NOTICE([ The following libs and flags will be used:])
Note: See TracChangeset for help on using the changeset viewer.