hal: Branch 'master'

[Danny Kukawka]

 configure.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 8b45f1229fe9490b263fbabbfbd0beaa9f904493 (from b31483c694da396c42944bec24f37182488a9bb7)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 12 21:15:08 2007 +0100

    fix expat detection in configure
    
    Fix the expat detection in configure. Since HAL really need expat
    to work configure should stop if expat.h or the expat library is
    missing.
    
    This fixes also the fd.o bug #10230.

diff --git a/configure.in b/configure.in
index 11e0a0d..3dd4162 100644
--- a/configure.in
+++ b/configure.in
@@ -294,8 +294,10 @@ AC_ARG_WITH(expat, [  --with-expat=<dir>
                       LDFLAGS="$LDFLAGS -L$withval/lib"
                       ]
                       )
-AC_CHECK_HEADERS(expat.h)
-AC_CHECK_LIB(expat,XML_ParserCreate, EXPAT_LIB="-lexpat")
+AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
+		 [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
+AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIB="-lexpat"],
+	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
 AC_SUBST(EXPAT_LIB)
 
 dnl Check libusb