AC_PREREQ(2.63)
-AC_INIT([libsecret],[0.4],
+AC_INIT([libsecret],[0.16],
[http://bugzilla.gnome.org/enter_bug.cgi?product=libsecret],
[libsecret])
dnl 3. If any interfaces have been added since the last public release, then increment age.
dnl 4. If any interfaces have been removed or changed since the last public release, then set age to 0.
-SECRET_MAJOR=0
+SECRET_MAJOR=1
SECRET_MINOR=0
SECRET_MICRO=0
AC_CONFIG_MACRO_DIR([build/m4])
AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
AM_SANITY_CHECK
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([library/secret-value.c])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_SRCDIR([libsecret/secret-value.c])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable])
# GLib
PKG_CHECK_MODULES(GLIB,
- glib-2.0 >= 2.31.0
- gio-2.0 >= 2.31.0
+ glib-2.0 >= 2.32.0
+ gio-2.0 >= 2.32.0
gio-unix-2.0)
LIBS="$LIBS $GLIB_LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
# --------------------------------------------------------------------
+# Manual pages
+
+AC_ARG_ENABLE(manpages,
+ AC_HELP_STRING([--disable-man-pages], [Build manual pages]))
+if test "$enable_manpages" != "no"; then
+ enable_manpages="yes"
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test x$XSLTPROC = x; then
+ AC_MSG_ERROR([xsltproc is required to build manual pages])
+ fi
+fi
+AM_CONDITIONAL(WITH_MANPAGES, test x$enable_manpages = xyes)
+
+# --------------------------------------------------------------------
+# Vala
+
+VALA_REQUIRED=0.17.2.12
+
+VAPIGEN_CHECK($VALA_REQUIRED)
+
+if test "$enable_vala" != "no"; then
+ AC_PATH_PROG([VALAC], [valac], [])
+fi
+AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
+
+# --------------------------------------------------------------------
# libgcrypt
GCRYPT_VERSION=1.2.2
])
if test "$enable_gcrypt" != "no"; then
- AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,
- AC_MSG_ERROR([[
+
+ have_gcrypt="no"
+ m4_ifdef([AM_PATH_LIBGCRYPT],
+ [AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION, have_gcrypt=yes)])
+
+ if test $have_gcrypt != "yes"; then
+ AC_MSG_ERROR([[
***
*** libgcrypt was not found. You may want to get it from
*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
***
- ]]))
+ ]])
+ fi
AC_DEFINE(WITH_GCRYPT, 1, [Build with libgcypt and transport encryption])
AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION",
-Wall -Wmissing-declarations \
-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
-Wdeclaration-after-statement -Wformat=2 -Winit-self \
- -Waggregate-return -Wmissing-format-attribute"
+ -Waggregate-return"
for option in -Wmissing-include-dirs -Wundef; do
SAVE_CFLAGS="$CFLAGS"
Makefile
build/Makefile
docs/Makefile
+ docs/man/Makefile
docs/reference/Makefile
docs/reference/libsecret/Makefile
docs/reference/libsecret/version.xml
+ docs/reference/libsecret/version-major.xml
egg/Makefile
egg/tests/Makefile
po/Makefile.in
po/Makefile
- library/Makefile
- library/libsecret.pc
- library/tests/Makefile
+ libsecret/Makefile
+ libsecret/libsecret.pc
+ libsecret/libsecret-unstable.pc
+ libsecret/tests/Makefile
tool/Makefile
])
AC_OUTPUT
echo "CFLAGS: $CFLAGS"
echo
echo "OPTIONS:"
-echo " libgcrypt: $gcrypt_status"
-echo " Debug: $debug_status"
-echo " Coverage: $enable_coverage"
+echo " libgcrypt: $gcrypt_status"
+echo " vala: $enable_vala"
+echo " Debug: $debug_status"
+echo " Coverage: $enable_coverage"
+echo " Manual Page: $enable_manpages"
echo