Various autotool adjustments

* configure: Add.
	* configure.ac (AM_INIT_AUTOMAKE): Use gcc versions.
        (PKG_CHECK_MODULES): Re-use libjava/classpath solution, naming.
	* m4/pkg.m4: Add, take from classpath.
	* src/Makefile.am: Adjust names.

configure.ac

@@ -9,7 +9,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([README])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11.2])
+AM_INIT_AUTOMAKE([1.11.1])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
@@ -18,8 +18,6 @@ dnl *************************************************
 dnl Here is the list of versions of the dependencies
 dnl *************************************************
 
-LIBXML2_VERSION=2.6.22
-
 AC_PROG_CXX
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_INSTALL
@@ -30,12 +28,11 @@ LT_INIT
 AC_LANG([C++])
 AC_LANG_COMPILER_REQUIRE
 
-PKG_CHECK_MODULES(ABIGAIL_DEPS, [libxml-2.0 >= $LIBXML2_VERSION])
-ABIGAIL_CFLAGS="$ABIGAIL_DEPS_CFLAGS"
-ABIGAIL_LIBS="$ABIGAIL_DEPS_LIBS"
-
-AC_SUBST(ABIGAIL_CFLAGS)
-AC_SUBST(ABIGAIL_LIBS)
+dnl Check for dependency: libxml
+LIBXML2_VERSION=2.6.22
+PKG_CHECK_MODULES(XML, libxml-2.0 >= $LIBXML2_VERSION)
+AC_SUBST(XML_LIBS)
+AC_SUBST(XML_CFLAGS)
 
 if test x$ABIGAIL_DEVEL != x; then
    DEVEL_CFLAGS="-g -Wall -Wextra -Werror"

m4/pkg.m4

@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+

src/Makefile.am

@@ -21,9 +21,9 @@ $(h)/abg-hash.cc			\
 $(h)/abg-writer.cc			\
 $(h)/abg-config.cc
 
-libabigail_la_LDFLAGS=@ABIGAIL_LIBS@ -Wl,--as-needed
+libabigail_la_LDFLAGS=@XML_LIBS@ -Wl,--as-needed
 
 publicheaders_DATA=$(headers)
 publicheadersdir=$(includedir)/libabigail
 
-AM_CPPFLAGS=@ABIGAIL_CFLAGS@ -Wall
+AM_CPPFLAGS=@XML_CFLAGS@ -Wall