Changeset 774 for trunk/configure.ac


Ignore:
Timestamp:
Feb 1, 2009, 7:02:13 PM (13 years ago)
Author:
Peter Johansson
Message:

fixes #378 and also fixed so -lapr ends up in LIBS and not LDFLAGS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r773 r774  
    9696# using extension beyond the C++ standard (usage of non C++ standard
    9797# 'long long' types).
    98 SD_CXXFLAGS="$SD_CXXFLAGS-Wall -pedantic -Wno-long-long"
     98YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-pedantic -Wno-long-long])
    9999AC_TYPE_LONG_LONG_INT
    100100
    101101AC_ARG_ENABLE(debug,
    102102  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
    103   [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"],
    104   [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
     103  [YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-g -O])],
     104  [YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[-DNDEBUG])
     105   YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-O3])])
    105106
    106107# enable svn-support
     
    121122if test "$apr_found" = "yes" ; then
    122123    SD_LIBS="`$apr_config --libs` $SD_LIBS"
    123     SD_LDFLAGS="`$apr_config --link-ld` $SD_LDFLAGS"
    124     SD_CPPFLAGS="`$apr_config --includes --cppflags` $SD_CPPFLAGS"
     124    apr_link_ld=`$apr_config --link-ld`
     125    for i in $apr_link_ld; do
     126      AS_IF([test ${i:0:2} = "-l"],[SD_LIBS="$i $SD_LIBS"],
     127            [YAT_LD_ADD_FLAG([SD_LDFLAGS], [$i])])
     128    done
     129    YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[`$apr_config --includes --cppflags`])
    125130fi
    126131
     
    130135  [AS_HELP_STRING([--with-svn=DIR],[prefix for svn developer files [[PREFIX]]])],
    131136  [ DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
    132     SD_LDFLAGS="-L$withval/lib $SD_LDFLAGS"
    133     SD_CPPFLAGS="-I$withval/include $SD_CPPFLAGS"])
     137    YAT_LD_ADD_FLAG([SD_LDFLAGS], [-L$withval/lib])
     138    YAT_CPP_ADD_FLAG([SD_CPPFLAGS], [-L$withval/include])
     139  ])
     140
    134141
    135142
Note: See TracChangeset for help on using the changeset viewer.