Switch debian build system to dh

[onak.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f8bb689169c7ad9469e1875b949bb108b7cac87a..55def5cf13a4420cf5cff9054d991a0f8a6c718b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,22 @@
 AC_PREREQ(2.50)
 AC_PREREQ(2.50)

-AC_INIT([onak],[0.3.4],[noodles-onak@earth.li])
+AC_INIT([onak],[0.4.1],[noodles-onak@earth.li])

 AC_CONFIG_SRCDIR(onak.c)
 AC_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_CONFIG_SRCDIR(onak.c)
 AC_CONFIG_HEADER(config.h)
 
 AC_PROG_CC

+AC_PROG_CC_C99

 
 AC_C_BIGENDIAN
 
 
 AC_C_BIGENDIAN
 

+m4_include([m4/ax_lib_nettle.m4])
+
+AX_LIB_NETTLE(auto)
+

 dnl We should always have these backends available.
 backends="file fs keyd"
 
 dnl We should always have these backends available.
 backends="file fs keyd"
 

+LIBCURL_CHECK_CONFIG(,,[have_libcurl="yes" backends="$backends hkp"],have_libcurl="no")
+

 AC_CHECK_LIB(pq, PQsetdbLogin,[have_libpq="yes" backends="$backends pg"],have_libpq="no")
 
 AC_CHECK_HEADER(db.h, have_db_h="yes", have_db_h="no")
 AC_CHECK_LIB(pq, PQsetdbLogin,[have_libpq="yes" backends="$backends pg"],have_libpq="no")
 
 AC_CHECK_HEADER(db.h, have_db_h="yes", have_db_h="no")


@@ -17,7 +24,7 @@ AC_MSG_CHECKING(for libdb version in db.h)
 printf "#include <db.h>\nDB_VERSION_MAJOR DB_VERSION_MINOR\n" >conftest.c
 set `eval $ac_cpp conftest.c | egrep '^ *[[0-9]] *'`; v="$1"; vv="$2"
 AC_MSG_RESULT($v.$vv)
 printf "#include <db.h>\nDB_VERSION_MAJOR DB_VERSION_MINOR\n" >conftest.c
 set `eval $ac_cpp conftest.c | egrep '^ *[[0-9]] *'`; v="$1"; vv="$2"
 AC_MSG_RESULT($v.$vv)

-if test "$v" -eq 4; then
+if test "$v" -ge 4; then

        for db in "db-$v.$vv" "db$v.$vv" "db-$v" "db$v" "db"; do
                AC_MSG_CHECKING(for db_create in lib$db)
                oldLIBS="$LIBS"
        for db in "db-$v.$vv" "db$v.$vv" "db-$v" "db$v" "db"; do
                AC_MSG_CHECKING(for db_create in lib$db)
                oldLIBS="$LIBS"