X-Git-Url: https://git.octo.it/?p=sort-networks.git;a=blobdiff_plain;f=configure.ac;h=11b9f599028eb0238f50ca9b4f6398efb9965afe;hp=680d4328d68f5a6466de156b9308d7e225cb4a51;hb=48c59e57e010d13aeba74ff02257127493377b5e;hpb=db7017455fa3804559584c706c20897794e0b1c2 diff --git a/configure.ac b/configure.ac index 680d432..11b9f59 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.65]) +AC_PREREQ([2.61]) AC_INIT([libsortnetwork], [1.0.0], [ff@octo.it]) AC_CONFIG_SRCDIR([src/sn_network.c]) AC_CONFIG_HEADERS([src/config.h]) @@ -14,11 +14,10 @@ AC_PROG_INSTALL AM_PROG_CC_C_O AC_DISABLE_STATIC AC_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG # Libtool stuff -LT_CONFIG_LTDL_DIR([libltdl]) LT_INIT -LTDL_INIT if test "x$GCC" = "xyes" then @@ -80,11 +79,15 @@ then AC_CHECK_HEADERS(population.h, [with_libpopulation="yes"], [with_libpopulation="no"]) - echo "with_libpopulation = $with_libpopulation" fi if test "x$with_libpopulation" = "xyes" then + if test "x$LIBPOPULATION_LIBS" = "x" + then + LIBPOPULATION_LIBS="-lpthread" + fi + AC_CHECK_LIB(population, population_create, [with_libpopulation="yes"], [with_libpopulation="no"], @@ -106,6 +109,10 @@ AC_SUBST(LIBPOPULATION_LIBS) AM_CONDITIONAL(BUILD_WITH_LIBPOPULATION, test "x$with_libpopulation" = "xyes") # }}} --with-libpopulation +PKG_CHECK_MODULES([glib], [glib-2.0], + [have_libglib="yes"], + [have_libglib="no"]) + AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT