build process polishing

3 files changed, 34 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index b169a65..288f3c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-2004-12-06 01:30  svu
+2004-12-07 00:20  svu
 	
 	* configure.in: using ac_x_includes to make configure
-	work better.
+	work better. Improved backend checking and diagnostics.
 	* autogen.sh: updating the version of tools
 
 2004-12-02 21:47  svu
diff --git a/autogen.sh b/autogen.sh
index 9baec0e..ad495e7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ DIE=0
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.5.6.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   }
@@ -29,7 +29,7 @@ grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
+    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.14.1.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   }
@@ -40,7 +40,7 @@ grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
+    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.14.1.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   }
@@ -49,7 +49,7 @@ grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.9.2.tar.gz"
   echo "(or a newer version if it is available)"
   DIE=1
   NO_AUTOMAKE=yes
@@ -61,7 +61,7 @@ test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.9.2.tar.gz"
   echo "(or a newer version if it is available)"
   DIE=1
 }
diff --git a/configure.in b/configure.in
index 3aad07e..de80736 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,10 @@ AC_ARG_WITH( xmodmap_base,
 AC_DEFINE_UNQUOTED(XMODMAP_BASE,"${xmodmap_base}",Base for xmodmap configuration)
 
 save_CFLAGS="$CFLAGS"
-CFLAGS="${CFLAGS} -I${ac_x_includes}"
+if test -n "$ac_x_includes"; then
+  X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
+  CFLAGS="${CFLAGS} $X_INCLUDES"
+fi
 
 ac_xkblib_include="\
 #include <stdio.h>
@@ -109,6 +112,16 @@ AC_ARG_ENABLE(xmm-support,
 
 AM_CONDITIONAL(ENABLE_XMM_SUPPORT, test "$enable_xmm_support" = "yes")
 
+AC_MSG_CHECKING(whether at least one libxklavier backend is enabled)
+if test \( "$enable_xkb_support" == "yes" -a \
+          "$xkb_headers_present" == "yes" \) -o \
+        "$enable_xmm_support" == "yes" ; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([no libxklavier backends configured])
+fi
+
 dnl Checks for libraries.
 PKG_CHECK_MODULES(XML, \
 	libxml-2.0 >= 2.0.0)
@@ -129,3 +142,16 @@ tests/Makefile
 libxklavier.pc
 ])
 
+echo '**********************************************************'
+echo '  Libxklavier is configured with the following backends:'
+if test "$enable_xkb_support" == "yes" ; then
+  if test "$xkb_headers_present" == "yes" ; then
+    echo '    XKB (libxkbfile headers are present)'
+  else
+    echo '    XKB (but libxkbfile headers are NOT present)'
+  fi
+fi
+if test "$enable_xmm_support" == "yes" ; then
+  echo '    xmodmap'
+fi
+echo '**********************************************************'