From f465aa76237915dfa58983da02e2ea0707ef0d07 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Wed, 28 Oct 2015 11:40:10 +0000
Subject: [PATCH] Updated build system to properly include checking of libxml2
 via xml2-config --cflags

---
 source/Makefile.in  |   3 --
 source/configure    | 115 +++++++++++++++++++++++---------------------
 source/configure.ac |  21 +++++---
 3 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index a2b25c7..7601f1f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -143,6 +143,3 @@ install:
 
 uninstall:
 	rm @BINDIR@/$(XAB_OUT)
-
-docs:
-	@SOFFICEOUT@
diff --git a/source/configure b/source/configure
index 8dff3da..4447bb9 100755
--- a/source/configure
+++ b/source/configure
@@ -4341,6 +4341,65 @@ fi
 
 # libxml2 Library
 
+CPPFLAGSOLD=CPPFLAGS
+CPPFLAGS=`xml2-config --cflags`
+
+# Extract the first word of "xml2-config", so it can be a program name with args.
+set dummy xml2-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_FOUND_XML2CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FOUND_XML2CONFIG"; then
+  ac_cv_prog_FOUND_XML2CONFIG="$FOUND_XML2CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FOUND_XML2CONFIG="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_FOUND_XML2CONFIG" && ac_cv_prog_FOUND_XML2CONFIG="no"
+fi
+fi
+FOUND_XML2CONFIG=$ac_cv_prog_FOUND_XML2CONFIG
+if test -n "$FOUND_XML2CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_XML2CONFIG" >&5
+$as_echo "$FOUND_XML2CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$FOUND_XML2CONFIG = xyes; then
+  FOUND_XML2CONFIG_RES_TRUE=
+  FOUND_XML2CONFIG_RES_FALSE='#'
+else
+  FOUND_XML2CONFIG_RES_TRUE='#'
+  FOUND_XML2CONFIG_RES_FALSE=
+fi
+
+
+if test -z "$FOUND_XML2CONFIG_RES_TRUE"; then :
+  else
+  echo "Cannot find the xml2-config program on your system.
+If it is installed on your system, adjust your PATH environment
+variable before running configure again."
+	exit -1
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml2" >&5
 $as_echo_n "checking for main in -lxml2... " >&6; }
 if ${ac_cv_lib_xml2_main+:} false; then :
@@ -4407,61 +4466,7 @@ fi
 done
 
 
-# Extract the first word of "xml2-config", so it can be a program name with args.
-set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FOUND_XML2CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FOUND_XML2CONFIG"; then
-  ac_cv_prog_FOUND_XML2CONFIG="$FOUND_XML2CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FOUND_XML2CONFIG="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_FOUND_XML2CONFIG" && ac_cv_prog_FOUND_XML2CONFIG="no"
-fi
-fi
-FOUND_XML2CONFIG=$ac_cv_prog_FOUND_XML2CONFIG
-if test -n "$FOUND_XML2CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_XML2CONFIG" >&5
-$as_echo "$FOUND_XML2CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test x$FOUND_XML2CONFIG = xyes; then
-  FOUND_XML2CONFIG_RES_TRUE=
-  FOUND_XML2CONFIG_RES_FALSE='#'
-else
-  FOUND_XML2CONFIG_RES_TRUE='#'
-  FOUND_XML2CONFIG_RES_FALSE=
-fi
-
-
-if test -z "$FOUND_XML2CONFIG_RES_TRUE"; then :
-  else
-  echo "Cannot find the xml2-config program on your system.
-If it is installed on your system, adjust your PATH environment
-variable before running configure again."
-	exit -1
-
-fi
+CPPFLAGS=CPPFLAGSOLD
 
 # file application
 
diff --git a/source/configure.ac b/source/configure.ac
index 9a51688..c2582f6 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -109,6 +109,18 @@ variable before running configure again."
 
 # libxml2 Library
 
+CPPFLAGSOLD=CPPFLAGS
+CPPFLAGS=`xml2-config --cflags`
+
+AC_CHECK_PROG([FOUND_XML2CONFIG], [xml2-config], [yes], [no]) 
+AM_CONDITIONAL([FOUND_XML2CONFIG_RES], [test x$FOUND_XML2CONFIG = xyes])
+
+AM_COND_IF([FOUND_XML2CONFIG_RES], [], [echo "Cannot find the xml2-config program on your system.
+If it is installed on your system, adjust your PATH environment
+variable before running configure again."
+	exit -1
+	])
+
 AC_CHECK_LIB([xml2], [main], [], [echo "The libxml2 library must be installed on your system.
 Please check that this library is installed properly before
 running configure again."
@@ -121,14 +133,7 @@ before running configure again."
 	exit -1
 	])
 
-AC_CHECK_PROG([FOUND_XML2CONFIG], [xml2-config], [yes], [no]) 
-AM_CONDITIONAL([FOUND_XML2CONFIG_RES], [test x$FOUND_XML2CONFIG = xyes])
-
-AM_COND_IF([FOUND_XML2CONFIG_RES], [], [echo "Cannot find the xml2-config program on your system.
-If it is installed on your system, adjust your PATH environment
-variable before running configure again."
-	exit -1
-	])
+CPPFLAGS=CPPFLAGSOLD
 
 # file application
 
-- 
2.39.2