echo "echo ${GIT_VERSION}" > ./version
fi
else
- GIT_VERSION=`sh -c ". ./$srcdir/version"`
+ GIT_VERSION=`sh -c ". $srcdir/version"`
fi
+
+if test \( -z "$GIT_VERSION" \); then
+ AC_MSG_ERROR([*** could not determine program version])
+fi
+
MAJOR_VERSION=${GIT_VERSION%%.*}
MINOR_VERSION=${GIT_VERSION#*.}
MINOR_VERSION=${MINOR_VERSION%%.*}
AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test x$PKG_CONFIG = xno ; then
- AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
-fi
+PKG_PROG_PKG_CONFIG
dnl libtool versioning
LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
dnl check for glib
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28 gmodule-2.0 >= 2.28 gobject-2.0 >= 2.28 gthread-2.0 >= 2.28)
-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
AC_SUBST(GLIB_CFLAGS)
])
],
[
- echo "Building without gnutls"
- enable_gnutls=no
+ echo "Building without GnuTLS"
+ AC_MSG_RESULT([*** GnuTLS support is recommended ])
+ AC_MSG_RESULT([*** You can use --disable-gnutls if you don't need it.])
+ AC_MSG_ERROR([GnuTLS not found])
])
AC_SUBST(GNUTLS_LIBS)
AC_SUBST(GNUTLS_CFLAGS)
fi
-dnl password encryption
-OLDLIBS=$LIBS
-LIBS=
-case $host_os in
- *dragonfly*)
- AC_SEARCH_LIBS(encrypt, cipher, [], AC_MSG_ERROR(['encrypt'-function not found.]))
- ;;
- freebsd*)
- ;; # not used
- *)
- AC_SEARCH_LIBS(encrypt, crypt, [], AC_MSG_ERROR(['encrypt'-function not found.]))
- ;;
-esac
-CRYPT_LIBS=$LIBS
-AC_SUBST(CRYPT_LIBS)
-LIBS=$OLDLIBS
+PKG_CHECK_MODULES(NETTLE, nettle)
+AC_SUBST(NETTLE_LIBS)
AC_ARG_WITH(passcrypt-key, [ --with-passcrypt-key=KEY Key used to encode passwords (8 byte string)],
with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
dnl #######################################################################
if test x"$enable_dbus" = xyes; then
if test x"$enable_networkmanager" = xyes; then
- PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, NetworkManager >= 0.6.2,
+ PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, libnm,
[
AC_DEFINE(HAVE_NETWORKMANAGER_SUPPORT, 1, [Define if NetworkManager support is to be included.])
echo "Building with NetworkManager support"