diff --git a/Makefile.am b/Makefile.am
index 1b46c8f8..ed4aa6c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 if PHP4_ENABLED
     PHP4_SD = php
 endif
diff --git a/autogen.sh b/autogen.sh
index f2743ec2..e6f55a94 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,309 +1,92 @@
 #!/bin/sh
-#
-# autogen.sh - Generates the initial makefiles from a pristine CVS tree
-#
-# $Id$
-#
-# USAGE: autogen.sh [configure options]
-#
-# If environment variable DRYRUN is set, no configuring will be done -
-# (e.g. in bash)  DRYRUN=1 ./autogen.sh
-# will not do any configuring but will emit the programs that would be run.
-#
-# This script is based on similar scripts used in various free software
-# projects; notably the gnome-autogen.sh script used in many GNOME programs.
-#
+# Run this to generate all the initial makefiles, etc.
+
+PROJECT=lasso
+TEST_TYPE=-f
+FILE=lasso.pc.in
+
+# a silly hack that generates autoregen.sh but it's handy
+echo "#!/bin/sh" > autoregen.sh
+echo "./autogen.sh $@ \$@" >> autoregen.sh
+chmod +x autoregen.sh
 
 DIE=0
 
-if test "z$DRYRUN" != "z"; then
-    DRYRUN=echo
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+THEDIR="`pwd`"
+
+cd "$srcdir"
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
+	DIE=1
+}
+
+if automake-1.11 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+elif automake-1.10 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+elif automake-1.9 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.9
+    ACLOCAL=aclocal-1.9
+elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.8
+    ACLOCAL=aclocal-1.8
+elif automake-1.7 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.7
+    ACLOCAL=aclocal-1.7
+elif automake-1.6 --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.6
+    ACLOCAL=aclocal-1.6
+else
+	echo
+	echo "You must have automake installed to compile $PROJECT."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
+	DIE=1
 fi
 
-# Not all echo versions allow -n, so we check what is possible. This test is
-# based on the one in autoconf.
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ;;
-  *c*,*  ) ECHO_N=-n ;;
-  *)       ECHO_N= ;;
-esac
+if test "$DIE" -eq 1; then
+	exit 1
+fi
 
-# some terminal codes ...
-boldface="`tput bold 2>/dev/null`"
-normal="`tput sgr0 2>/dev/null`"
-printbold() {
-    echo $ECHO_N "$boldface"
-    echo "$@"
-    echo $ECHO_N "$normal"
-}    
-printerr() {
-    echo "$@" >&2
-}
-
-# Usage:
-#     compare_versions MIN_VERSION ACTUAL_VERSION
-# returns true if ACTUAL_VERSION >= MIN_VERSION
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
-}
-
-# Usage:
-#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
-# checks to see if the package is available
-version_check() {
-    vc_package=$1
-    vc_variable=$2
-    vc_checkprogs=$3
-    vc_min_version=$4
-    vc_source=$5
-    vc_status=1
-
-    vc_checkprog=`eval echo "\\$$vc_variable"`
-    if [ -n "$vc_checkprog" ]; then
-	printbold "using $vc_checkprog for $vc_package"
-	return 0
-    fi
-
-    printbold "checking for $vc_package >= $vc_min_version..."
-    for vc_checkprog in $vc_checkprogs; do
-	echo $ECHO_N "  testing $vc_checkprog... "
-	if $vc_checkprog --version < /dev/null > /dev/null 2>&1 || \
-		$vc_checkprog -version < /dev/null > /dev/null 2>&1 ; then
-            if [ "$vc_package" = "swig" ]; then
-                vc_actual_version=`$vc_checkprog -version 2>&1 | head -n 2 | \
-                                  tail -1 | sed 's/^.*[      ]\([0-9.]*[a-z]*\).*$/\1/'`
-            else
-	        vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-                                  sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
-            fi
-	    if compare_versions $vc_min_version $vc_actual_version; then
-		echo "found $vc_actual_version"
-		# set variable
-		eval "$vc_variable=$vc_checkprog"
-		vc_status=0
-		break
-	    else
-		echo "too old (found version $vc_actual_version)"
-	    fi
-	else
-	    echo "not found."
-	fi
-    done
-    if [ "$vc_status" != 0 ]; then
-	printerr "***Error***: You must have $vc_package >= $vc_min_version installed"
-	printerr "  to build $PKG_NAME.  Download the appropriate package for"
-	printerr "  from your distribution or get the source tarball at"
-        printerr "    $vc_source"
-	printerr
-    fi
-    return $vc_status
-}
-
-# Usage:
-#     require_m4macro filename.m4
-# adds filename.m4 to the list of required macros
-require_m4macro() {
-    case "$REQUIRED_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
-    esac
-}
-
-forbid_m4macro() {
-    case "$FORBIDDEN_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
-    esac
-}
-
-# Usage:
-#     check_m4macros
-# Checks that all the requested macro files are in the aclocal macro path
-# Uses REQUIRED_M4MACROS and ACLOCAL variables.
-check_m4macros() {
-    # construct list of macro directories
-    cm_macrodirs="`$ACLOCAL --print-ac-dir`"
-    set - $ACLOCAL_FLAGS
-    while [ $# -gt 0 ]; do
-	if [ "$1" = "-I" ]; then
-	    cm_macrodirs="$cm_macrodirs $2"
-	    shift
-	fi
-	shift
-    done
-
-    cm_status=0
-    if [ -n "$REQUIRED_M4MACROS" ]; then
-	printbold "Checking for required M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $REQUIRED_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-		# The macro dir in Cygwin environments may contain a file
-		# called dirlist containing other directories to look in.
-		if [ -f "$cm_dir/dirlist" ]; then
-		    for cm_otherdir in `cat $cm_dir/dirlist`; do
-			if [ -f "$cm_otherdir/$cm_macro" ]; then
-			    cm_macrofound=true
-		            break
-			fi
-		    done
-		fi
-	    done
-	    if $cm_macrofound; then
-		:
-	    else
-		printerr "  $cm_macro not found"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ -n "$FORBIDDEN_M4MACROS" ]; then
-	printbold "Checking for forbidden M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $FORBIDDEN_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-	    done
-	    if $cm_macrofound; then
-		printerr "  $cm_macro found (should be cleared from macros dir)"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-	printerr "***Error***: some autoconf macros required to build $PKG_NAME"
-	printerr "  were not found in your aclocal path, or some forbidden"
-	printerr "  macros were found.  Perhaps you need to adjust your"
-	printerr "  ACLOCAL_FLAGS?"
-	printerr
-    fi
-    return $cm_status
-}
-
-
-
-printbold "checking this is lasso top-level directory..."
-test -f lasso/lasso.h  || {
-	printerr "***Error***: You must run this script in lasso top-level directory"
+test $TEST_TYPE $FILE || {
+	echo "You must run this script in the top-level $PROJECT directory"
 	exit 1
 }
 
-REQUIRED_AUTOCONF_VERSION=2.53
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_LIBTOOL_VERSION=1.5
-REQUIRED_SWIG_VERSION=1.3.28
-REQUIRED_PKG_CONFIG_VERSION=0.14.0
-
-# For cygwin wrapper and perphas others ?
-WANT_AUTOCONF_VER=$REQUIRED_AUTOCONF_VERSION
-WANT_AUTOMAKE_VER=$REQUIRED_AUTOMAKE_VERSION
-WANT_LIBTOOL_VER=$REQUIRED_LIBTOOL_VERSION
-export WANT_AUTOCONF_VER WANT_AUTOMAKE_VER WANT_LIBTOOL_VER
-
-automake_args=--add-missing
-autoconf_args=
-aclocal_args="-I macros"
-
-program=`basename $0`
-
-WANT_AUTOCONF_2_5=1 # for Mandrake wrapper
-export WANT_AUTOCONF_2_5
-version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53 autoconf253' $REQUIRED_AUTOCONF_VERSION \
-    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
-AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
-
-case $REQUIRED_AUTOMAKE_VERSION in
-    1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;;
-    1.9*) automake_progs="automake-1.9 automake-1.10" ;;
-    1.10*) automake_progs="automake-1.10" ;;
-esac
-
-version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
-ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
-
-version_check swig SWIG "swig-1.3 swig" $REQUIRED_SWIG_VERSION \
-    "http://prdownloads.sourceforge.net/swig/swig-$REQUIRED_SWIG_VERSION.tar.gz" || DIE=1
-
-version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \
-    "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1
-require_m4macro libtool.m4
-
-version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \
-    "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" || DIE=1
-require_m4macro pkg.m4
-
-check_m4macros || DIE=1
-
-# - If something went wrong, exit with error code:1.
-if [ "$DIE" -eq 1 ]; then
-    exit 1
+if test "$#" = 0; then
+	echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-if test -z "$*"; then
-    printerr "**Warning**: I am going to run \`configure' with no arguments."
-    printerr "If you wish to pass any to it, please specify them on the"
-    printerr \`$0\'" command line."
-fi
+# to support timj aclocal setup we are shipping gnome-doc-utils.m4
+# and making sure automake picks it up ;)
+# this is bad as -I prepends to the search path
+echo "* Running $ACLOCAL"
+$ACLOCAL $ACLOCAL_FLAGS -I m4 || exit $?
 
-# cleaning up some files
-$DRYRUN rm -f ltconfig ltmain.sh libtool
-$DRYRUN rm -f configure
-$DRYRYN rm -f missing depcomp
-$DRYRUN rm -rf autom4te.cache
+echo "* Running autoconf"
+autoconf || exit $?
+# optionally feature autoheader
+#(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-printbold "Running $LIBTOOLIZE..."
-$DRYRUN $LIBTOOLIZE --force --copy || exit 1
+echo "* Running libtoolize"
+libtoolize --copy --force
 
-printbold "Running $ACLOCAL..."
-aclocalinclude="$ACLOCAL_FLAGS"
-$DRYRUN $ACLOCAL $aclocal_args $aclocalinclude || exit 1
+echo "* Running $AUTOMAKE"
+$AUTOMAKE --add-missing -Wno-portability $am_opt || exit $?
 
-printbold "Running $AUTOHEADER..."
-$DRYRUN $AUTOHEADER || exit 1
+cd "$THEDIR"
 
-printbold "Running $AUTOMAKE..."
-$DRYRUN $AUTOMAKE $automake_args $am_opt
-
-printbold "Running $AUTOCONF..."
-$DRYRUN $AUTOCONF $autoconf_args
-
-printbold "Cleaning up configuration cache..."
-$DRYRUN rm -f config.cache
-
-export AUTOMAKE AUTOCONF ACLOCAL
-
-printbold Running ./configure $conf_flags "$@" ...
-if test "z$DRYRUN" = "z"; then
-    ./configure $conf_flags "$@" \
-            && echo "Now type 'make' to compile lasso." || exit 1
-else
-    $DRYRUN ./configure $conf_flags "$@"
-fi
+$srcdir/configure --enable-maintainer-mode "$@" || exit $?
 
+echo
+echo "Now type 'make install' to install $PROJECT."
diff --git a/configure.ac b/configure.ac
index 7f7e798e..12cefde0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,10 @@ dnl - Second number is the number of supported API versions where API version >
 dnl   first number.
 dnl - Third number is the current API version implementation version number.
 dnl See libtool explanations about current, age and release, later in this file.
-AC_INIT([Liberty Alliance Single Sign On], 2.2.2, lasso-devel@lists.labs.libre-entreprise.org)
+AC_INIT([lasso], 2.2.2, lasso-devel@lists.labs.libre-entreprise.org)
 dnl Check if autoconf ver > 2.53
 AC_PREREQ(2.53)
+AC_CONFIG_MACRO_DIR([m4])
 dnl Perform only subset commands and variable relevant to the host type.
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
@@ -27,7 +28,9 @@ dnl Copy stamp REVISIO-INFO in the configure script.
 AC_REVISION($Revision$)
 
 dnl Run many macros mostly needed by configure.ac.
-AM_INIT_AUTOMAKE(lasso, 2.2.2)
+AM_INIT_AUTOMAKE([foreign])
+dnl Support automake 1.11 silent mode
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl Create rules to automaticaly regenerate the config header.
 AM_CONFIG_HEADER([config.h lasso/lasso_config.h])
 dnl Add --enable-maintainer-mode option to configure.
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index aa5a9a5c..f468ea88 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -83,8 +83,8 @@ GTKDOC_LIBS = 	\
 	$(LASSO_LIBS) \
 	$(top_builddir)/lasso/liblasso.la
 
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC)
 
 scan: doc_sources lasso.types
 	test -d build || mkdir build
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index b65cb32d..fce83aed 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -40,7 +40,7 @@ MAINTAINERCLEANFILES = \
 	lasso_config.h.in
 
 clean-local:
-	-rm types.c symbols.sym errors.c
+	-rm -f types.c symbols.sym errors.c
 
 EXTRA_DIST = utils.h extract_types.py extract_symbols.py build_strerror.py \
 	     registry-private.h errors.c.in backward_comp.h
diff --git a/macros/ac_check_class.m4 b/m4/ac_check_class.m4
similarity index 100%
rename from macros/ac_check_class.m4
rename to m4/ac_check_class.m4
diff --git a/macros/ac_check_classpath.m4 b/m4/ac_check_classpath.m4
similarity index 100%
rename from macros/ac_check_classpath.m4
rename to m4/ac_check_classpath.m4
diff --git a/macros/ac_check_java_home.m4 b/m4/ac_check_java_home.m4
similarity index 100%
rename from macros/ac_check_java_home.m4
rename to m4/ac_check_java_home.m4
diff --git a/macros/ac_check_junit.m4 b/m4/ac_check_junit.m4
similarity index 100%
rename from macros/ac_check_junit.m4
rename to m4/ac_check_junit.m4
diff --git a/macros/ac_check_rqrd_class.m4 b/m4/ac_check_rqrd_class.m4
similarity index 100%
rename from macros/ac_check_rqrd_class.m4
rename to m4/ac_check_rqrd_class.m4
diff --git a/macros/ac_java_options.m4 b/m4/ac_java_options.m4
similarity index 100%
rename from macros/ac_java_options.m4
rename to m4/ac_java_options.m4
diff --git a/macros/ac_prog_jar.m4 b/m4/ac_prog_jar.m4
similarity index 100%
rename from macros/ac_prog_jar.m4
rename to m4/ac_prog_jar.m4
diff --git a/macros/ac_prog_java.m4 b/m4/ac_prog_java.m4
similarity index 100%
rename from macros/ac_prog_java.m4
rename to m4/ac_prog_java.m4
diff --git a/macros/ac_prog_java_cc.m4 b/m4/ac_prog_java_cc.m4
similarity index 100%
rename from macros/ac_prog_java_cc.m4
rename to m4/ac_prog_java_cc.m4
diff --git a/macros/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4
similarity index 100%
rename from macros/ac_prog_java_works.m4
rename to m4/ac_prog_java_works.m4
diff --git a/macros/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
similarity index 100%
rename from macros/ac_prog_javac.m4
rename to m4/ac_prog_javac.m4
diff --git a/macros/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4
similarity index 100%
rename from macros/ac_prog_javac_works.m4
rename to m4/ac_prog_javac_works.m4
diff --git a/macros/ac_prog_javadoc.m4 b/m4/ac_prog_javadoc.m4
similarity index 100%
rename from macros/ac_prog_javadoc.m4
rename to m4/ac_prog_javadoc.m4
diff --git a/macros/ac_prog_javah.m4 b/m4/ac_prog_javah.m4
similarity index 100%
rename from macros/ac_prog_javah.m4
rename to m4/ac_prog_javah.m4
diff --git a/macros/ac_try_compile_java.m4 b/m4/ac_try_compile_java.m4
similarity index 100%
rename from macros/ac_try_compile_java.m4
rename to m4/ac_try_compile_java.m4
diff --git a/macros/ac_try_run_javac.m4 b/m4/ac_try_run_javac.m4
similarity index 100%
rename from macros/ac_try_run_javac.m4
rename to m4/ac_try_run_javac.m4
diff --git a/macros/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
similarity index 100%
rename from macros/as-compiler-flag.m4
rename to m4/as-compiler-flag.m4
diff --git a/macros/check.m4 b/m4/check.m4
similarity index 100%
rename from macros/check.m4
rename to m4/check.m4
diff --git a/macros/dps_java_check_class.m4 b/m4/dps_java_check_class.m4
similarity index 100%
rename from macros/dps_java_check_class.m4
rename to m4/dps_java_check_class.m4
diff --git a/macros/dps_libgcj_jar.m4 b/m4/dps_libgcj_jar.m4
similarity index 100%
rename from macros/dps_libgcj_jar.m4
rename to m4/dps_libgcj_jar.m4
diff --git a/macros/dps_xtra_classpath.m4 b/m4/dps_xtra_classpath.m4
similarity index 100%
rename from macros/dps_xtra_classpath.m4
rename to m4/dps_xtra_classpath.m4
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
new file mode 100644
index 00000000..bfdfa1da
--- /dev/null
+++ b/m4/gtk-doc.m4
@@ -0,0 +1,39 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH([html-dir],
+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST([HTML_DIR])
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE([gtk-doc],
+    AS_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [[default=no]]]),,
+    [enable_gtk_doc=no])
+
+  if test x$enable_gtk_doc = xyes; then
+    ifelse([$1],[],
+      [PKG_CHECK_EXISTS([gtk-doc],,
+                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
+  fi
+
+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
+  AC_MSG_RESULT($enable_gtk_doc)
+
+  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
+
+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+])