X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure.ac;h=76b79ab99c9c8d9b600cc01580e14b3ad6c1d3cb;hb=cb26a09770eb911732f753d2db010b410ac9d241;hp=9a516889155cfdcef503d8c30eaa9ea414e11874;hpb=a117b08db467757f5920a4cc5791f89a3b5d830c;p=xestiaab%2F.git diff --git a/source/configure.ac b/source/configure.ac index 9a51688..76b79ab 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([Xestia Address Book], [0.01], [bugs@xestia.co.uk]) +AC_INIT([Xestia Address Book], [0.03], [bugs@xestia.co.uk]) #AC_CONFIG_SRCDIR([version.h]) #AC_CONFIG_HEADERS([config.h]) @@ -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