Post-release.

[gpgme.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0f6e488885cff6906f655761c87526ddc79f035..ca88b84996b7a0f768fd2373575145825d4860e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 # (Process this file with autoconf to produce a configure script.)
 AC_PREREQ(2.59)
-min_automake_version="1.10"
+min_automake_version="1.11"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Make sure to run  "svn up" and "./autogen.sh --force"
@@ -51,10 +51,10 @@ AC_INIT([gpgme],
 #   (Interfaces added:                 AGE++)
 #   (Interfaces removed/changed:       AGE=0)
 #
-LIBGPGME_LT_CURRENT=18
+LIBGPGME_LT_CURRENT=19
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=7
+LIBGPGME_LT_AGE=8
 LIBGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
@@ -263,6 +263,7 @@ else
    INSERT__TYPEDEFS_FOR_GPGME_H="#include <sys/types.h>"
 fi
 AC_SUBST(INSERT__TYPEDEFS_FOR_GPGME_H)
+AM_SUBST_NOTMAKE(INSERT__TYPEDEFS_FOR_GPGME_H)
 
 # Checks for compiler features.
 if test "$GCC" = yes; then
@@ -860,8 +861,6 @@ fi
 AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no")
 
 
-AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")
-
 # Generate values for the DLL version info
 if test "$have_w32_system" = yes; then
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
@@ -901,9 +900,11 @@ AH_BOTTOM([
 # Substitution used for gpgme-config
 GPGME_CONFIG_LIBS="-lgpgme"
 GPGME_CONFIG_CFLAGS=""
+GPGME_CONFIG_HOST="$host"
 AC_SUBST(GPGME_CONFIG_API_VERSION)
 AC_SUBST(GPGME_CONFIG_LIBS)
 AC_SUBST(GPGME_CONFIG_CFLAGS)
+AC_SUBST(GPGME_CONFIG_HOST)
 
 # Frob'da Variables
 LTLIBOBJS=`echo "$LIB@&t@OBJS" |
@@ -954,7 +955,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
                 tests/gpg/Makefile
                 tests/gpgsm/Makefile
                 tests/opassuan/Makefile
-               doc/Makefile complus/Makefile
+               doc/Makefile
                 src/versioninfo.rc
                 src/gpgme.h)
 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)