Ignore:
Timestamp:
Nov 16, 2009, 11:27:19 PM (12 years ago)
Author:
Jari Häkkinen
Message:

Merged trunk changes -r782:844 to replacing_gnuplot branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/replacing_gnuplot/configure.ac

    r786 r845  
    3232
    3333m4_include([m4/version.m4])
    34 AC_INIT([svndigest],[SVNDIGEST_VERSION],[jari@thep.lu.se])
     34AC_INIT([svndigest],[SVNDIGEST_VERSION],[jari@thep.lu.se],,
     35        [http://dev.thep.lu.se/svndigest])
    3536AC_CONFIG_SRCDIR([lib/File.h])
    3637AC_CONFIG_AUX_DIR([autotools])
     
    99100
    100101AC_ARG_ENABLE([debug],
    101   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
     102  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])])
     103
     104AS_IF([test x$enable_debug = xyes],
    102105  [YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-g -O])],
    103106  [YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[-DNDEBUG])
     
    109112                              [enable svn support - used by maintainer])])
    110113
    111 AS_IF([test "x$enable_svn-support" = xyes],
    112       [AC_CHECK_FILE([$srcdir/.svn],,
    113                      [AC_MSG_ERROR([svn support cannot be enabled: `$srcdir' is not an svn wc.])])])
    114 AM_CONDITIONAL([ENABLE_SVN_SUPPORT], [test "x$enable_svn-support" = "xyes"])
     114AS_IF([test "x$enable_svn_support" = xyes],
     115      [AS_IF([test -d $srcdir/.svn], [],
     116             [AC_MSG_ERROR([svn support cannot be enabled: `$srcdir' is not an svn wc.])])])
     117AM_CONDITIONAL([ENABLE_SVN_SUPPORT], [test "x$enable_svn_support" = "xyes"])
    115118
    116119# Apache Portable Runtime (APR) API checks
     
    135138  [ DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
    136139    YAT_LD_ADD_FLAG([SD_LDFLAGS], [-L$withval/lib])
    137     YAT_CPP_ADD_FLAG([SD_CPPFLAGS], [-L$withval/include])
     140    YAT_CPP_ADD_FLAG([SD_CPPFLAGS], [-I$withval/include])
    138141  ])
    139142
     
    185188
    186189# checking if we build in a subversion WC
    187 AC_CHECK_FILE([$srcdir/.svn], [wc_found="yes"], [wc_found="no"])
     190AS_IF([test -d $srcdir/.svn], [wc_found="yes"], [wc_found="no"])
    188191AM_CONDITIONAL([HAVE_SVN_WC], [test "$wc_found" = "yes"])
    189192AC_SUBST([wc_found])
     
    191194# checking if we have test repo
    192195test_repo_filename=$srcdir/test/repo;
    193 AC_CHECK_FILE([$test_repo_filename],
     196AS_IF([test -r $test_repo_filename],
    194197              [AC_DEFINE([HAVE_TEST_REPO],[1],[define if test repo is available])
    195198               test_repo_found="yes"],
     
    209212                bin/Makefile
    210213                lib/Makefile
     214                lib/yat/Makefile
    211215                man/Makefile
    212216                test/environment.h
    213217                test/Makefile])
     218
     219AC_CONFIG_HEADER([lib/yat/config_public.h])
    214220
    215221# Print failure status information about selected items, and exit if
Note: See TracChangeset for help on using the changeset viewer.