configure.ac (ncdc-1.23) | : | configure.ac (ncdc-1.23.1) | ||
---|---|---|---|---|
AC_INIT([ncdc], [1.23], [projects@yorhel.nl]) | AC_INIT([ncdc],[1.23.1],[projects@yorhel.nl]) | |||
AC_CONFIG_SRCDIR([src/ncdc.h]) | AC_CONFIG_SRCDIR([src/ncdc.h]) | |||
AC_CONFIG_HEADER([config.h]) | AC_CONFIG_HEADERS([config.h]) | |||
m4_include([deps/lean.m4]) | m4_include([deps/lean.m4]) | |||
AM_INIT_AUTOMAKE([foreign subdir-objects]) | AM_INIT_AUTOMAKE([foreign subdir-objects]) | |||
PKG_PROG_PKG_CONFIG([0.18]) | PKG_PROG_PKG_CONFIG([0.18]) | |||
# Check for programs. | # Check for programs. | |||
AC_PROG_CC | AC_PROG_CC | |||
AC_PROG_INSTALL | AC_PROG_INSTALL | |||
AC_PROG_RANLIB | AC_PROG_RANLIB | |||
AC_SYS_LARGEFILE | AC_SYS_LARGEFILE | |||
skipping to change at line 129 | skipping to change at line 129 | |||
PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.0]) | PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.0]) | |||
AC_ARG_WITH([geoip], | AC_ARG_WITH([geoip], | |||
[AS_HELP_STRING([--with-geoip], [support for IP-to-country lookups @ <:@default=no@:>@])], | [AS_HELP_STRING([--with-geoip], [support for IP-to-country lookups @ <:@default=no@:>@])], | |||
[], | [], | |||
[with_geoip=no]) | [with_geoip=no]) | |||
AS_IF([test "x$with_geoip" = xyes], | AS_IF([test "x$with_geoip" = xyes], | |||
[PKG_CHECK_MODULES([GEOIP], | [PKG_CHECK_MODULES([GEOIP], | |||
[libmaxminddb >= 1.0], | [libmaxminddb >= 1.0], | |||
[AC_DEFINE(USE_GEOIP, 1, [Use libmaxminddb for IP-to-co untry lookups])])]) | [AC_DEFINE(USE_GEOIP, 1, [Use libmaxminddb for IP-to-co untry lookups])])]) | |||
# Check whether we should use the version string from AC_INIT(), or use | # Check whether we should use the version string from AC_INIT, or use | |||
# git-describe to create one. This trick is copied from the pacman source. | # git-describe to create one. This trick is copied from the pacman source. | |||
AC_ARG_ENABLE(git-version, | AC_ARG_ENABLE(git-version, | |||
AS_HELP_STRING([--enable-git-version], [enable use of git version in version s tring if available]), | AS_HELP_STRING([--enable-git-version], [enable use of git version in version s tring if available]), | |||
[wantgitver=$enableval], [wantgitver=yes]) | [wantgitver=$enableval], [wantgitver=yes]) | |||
usegitver=no | usegitver=no | |||
if test "x$wantgitver" = "xyes" ; then | if test "x$wantgitver" = "xyes" ; then | |||
AC_CHECK_PROGS([GIT], [git], [no]) | AC_CHECK_PROGS([GIT], [git], [no]) | |||
test "x$GIT" != "xno" -a -d "$srcdir/.git" && usegitver=yes | test "x$GIT" != "xno" -a -d "$srcdir/.git" && usegitver=yes | |||
skipping to change at line 155 | skipping to change at line 155 | |||
installmanpage=yes | installmanpage=yes | |||
if test "x$have_pod2man" = "xno" -a \! -s "$srcdir/doc/ncdc.1"; then | if test "x$have_pod2man" = "xno" -a \! -s "$srcdir/doc/ncdc.1"; then | |||
echo "" | echo "" | |||
echo "Note: Could not find doc/ncdc.1 in the source directory nor the pod2man" | echo "Note: Could not find doc/ncdc.1 in the source directory nor the pod2man" | |||
echo "utility on your system. No manual page will be installed." | echo "utility on your system. No manual page will be installed." | |||
echo "" | echo "" | |||
installmanpage=no | installmanpage=no | |||
fi | fi | |||
AM_CONDITIONAL([INSTALL_MANPAGE], [test "x$installmanpage" = "xyes"]) | AM_CONDITIONAL([INSTALL_MANPAGE], [test "x$installmanpage" = "xyes"]) | |||
AC_OUTPUT([Makefile]) | AC_CONFIG_FILES([Makefile]) | |||
AC_OUTPUT | ||||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |