From 560af6fc8de9b2c3ac3bf06315b77c4e9b19f95c Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Mon, 4 Aug 2008 20:43:06 +0000
Subject: [PATCH] Add --without-expat support to ./configure

---
 cmd/tools/gxl2gv.c |  2 +-
 configure.ac       | 80 +++++++++++++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index 1c720d48e..aa7965c2d 100644
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -20,7 +20,7 @@
 #include    "aghdr.h"
 #endif
 #include    "agxbuf.h"
-#ifdef HAVE_LIBEXPAT
+#ifdef HAVE_EXPAT
 #include    <expat.h>
 #include    <ctype.h>
 
diff --git a/configure.ac b/configure.ac
index b9172e8e1..729258295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1629,47 +1629,60 @@ LIBS=$save_LIBS
 dnl -----------------------------------
 dnl INCLUDES and LIBS for EXPAT
 
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-AC_PATH_PROG(EXPAT_CONFIG,expat-config)
-if test -n "$EXPAT_CONFIG"; then
+AC_ARG_WITH(expat,
+  [AC_HELP_STRING([--with-expat=yes], [use expat])],
+  [],[with_expat=yes])
+
+if test "x$with_expat" != "xyes"; then
+  use_expat="No (disabled)"
+else
+
+  save_CPPFLAGS=$CPPFLAGS
+  save_LDFLAGS=$LDFLAGS
+  AC_PATH_PROG(EXPAT_CONFIG,expat-config)
+  if test -n "$EXPAT_CONFIG"; then
 	EXPAT_INCLUDES=`$EXPAT_CONFIG --cflags`
 	EXPAT_PREFIX=`$EXPAT_CONFIG --prefix`
 	if test "${EXPAT_PREFIX}/lib" != "/usr/lib" ; then
 		EXPAT_LIBS="-L${EXPAT_PREFIX}/lib"
 	fi
-else         
+  else         
 	EXPAT_INCLUDES=""
 	EXPAT_LIBS=""
+  fi
+  AC_ARG_WITH(expatincludedir,
+    [AC_HELP_STRING([--with-expatincludedir=DIR], [use EXPAT includes from DIR])],
+    [EXPAT_INCLUDES="-I$withval"])
+  CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
+  EXPAT_LIBDIR="/usr/lib$LIBPOSTFIX"
+  AC_ARG_WITH(expatlibdir,
+    [AC_HELP_STRING([--with-expatlibdir=DIR], [use EXPAT libraries from DIR])],
+    [EXPAT_LIBDIR="$withval"])
+  if test "$EXPAT_LIBDIR" != "/usr/lib$LIBPOSTFIX"; then
+	  EXPAT_LIBS="-L$EXPAT_LIBDIR"
+	  LDFLAGS="$LDFLAGS $EXPAT_LIBS"
+  fi
+  AC_CHECK_HEADERS([expat.h],
+    [],
+    [use_expat="No (missing header)"
+     AC_MSG_WARN(Optional expat library not available - missing headers)],
+    [])
+  AC_CHECK_LIB(expat,main,
+    [EXPAT_LIBS="$EXPAT_LIBS -lexpat"],
+    [use_expat="No (missing library)"
+     AC_MSG_WARN(Optional expat library not available)],
+    [])
+  LDFLAGS=$save_LDFLAGS
+  CPPFLAGS=$save_CPPFLAGS
 fi
-AC_ARG_WITH(expatincludedir,
-  [AC_HELP_STRING([--with-expatincludedir=DIR], [use EXPAT includes from DIR])],
-  [EXPAT_INCLUDES="-I$withval"])
-CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
-EXPAT_LIBDIR="/usr/lib$LIBPOSTFIX"
-AC_ARG_WITH(expatlibdir,
-  [AC_HELP_STRING([--with-expatlibdir=DIR], [use EXPAT libraries from DIR])],
-  [EXPAT_LIBDIR="$withval"])
-if test "$EXPAT_LIBDIR" != "/usr/lib$LIBPOSTFIX"; then
-	EXPAT_LIBS="-L$EXPAT_LIBDIR"
-	LDFLAGS="$LDFLAGS $EXPAT_LIBS"
-fi
-if test -f "$EXPAT_LIBDIR/libexpat.la"; then
-	EXPAT_LIBS="$EXPAT_LIBDIR/libexpat.la"
-fi
-AC_CHECK_HEADER(expat.h,
-	[AC_CHECK_LIB(expat,main,
-		[EXPAT_LIBS="$EXPAT_LIBS -lexpat"
-		AC_DEFINE_UNQUOTED(HAVE_LIBEXPAT,1,
-			[Define if you have the EXPAT library])],
-		[AC_MSG_WARN(Optional expat library not available)
-		EXPAT_INCLUDES="" EXPAT_LIBS=""])],
-	[AC_MSG_WARN(Optional expat library not available - no expat.h)])
-LDFLAGS=$save_LDFLAGS
-CPPFLAGS=$save_CPPFLAGS
-AC_SUBST(EXPAT_INCLUDES)
-AC_SUBST(EXPAT_LIBS)
-
+if test "x$use_expat" = "x"; then
+  use_expat="Yes"
+  AC_DEFINE_UNQUOTED(HAVE_EXPAT,1,
+    [Define if you have the expat library])
+  AC_SUBST(EXPAT_INCLUDES)
+  AC_SUBST(EXPAT_LIBS)
+fi
+  
 dnl -----------------------------------
 dnl INCLUDES and LIBS for DEVIL
 
@@ -2958,6 +2971,7 @@ echo "  sfdp:          $use_sfdp"
 echo "  codegens:      $use_codegens"
 echo "  fontconfig:    $use_fontconfig"
 echo "  freetype:      $use_freetype"
+echo "  expat:         $use_expat"
 echo ""
 echo "commands:"
 echo "  dot:           Yes (always enabled)"
-- 
2.40.0