X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure.ac;h=76b79ab99c9c8d9b600cc01580e14b3ad6c1d3cb;hb=cb26a09770eb911732f753d2db010b410ac9d241;hp=6e792d389b0a77f97493c5928f746b05b93bd7e9;hpb=5ee17950e2c44804fbaf660837f88d725136b978;p=xestiaab%2F.git

diff --git a/source/configure.ac b/source/configure.ac
index 6e792d3..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])
 
@@ -13,6 +13,25 @@ AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 
+# Check prefix directories.
+
+if test "x$prefix" = "xNONE" ; then
+	prefix="/usr/local"
+fi
+
+if test "x$exec_prefix" = "xNONE" ; then
+	exec_prefix=$prefix
+fi
+
+PREFIX=$prefix
+AC_SUBST([PREFIX])
+
+if test "x$bindir" = "xNONE" ; then
+	bindir="/bin"
+fi
+BINDIR=`eval echo $bindir`
+AC_SUBST([BINDIR])
+
 # Checks for libraries.
 
 # wxWidgets
@@ -63,20 +82,6 @@ before running configure again."
 	exit -1
 	])
 
-# ossp-uuid Library
-
-AC_CHECK_LIB([ossp-uuid++], [main], [], [echo "The OSSP UUID C++ library must be installed on your system.
-Please check that this library is installed properly before
-running configure again."
-	exit -1
-	])
-
-AC_CHECK_HEADER([ossp/uuid++.hh], [], [echo "The OSSP UUID C++ library headers must be installed on your system.
-Please check that the library headers are installed properly
-before running configure again."
-	exit -1
-	])
-
 AC_LANG_PUSH([C++])
 
 # curl Library
@@ -104,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."
@@ -116,10 +133,25 @@ 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])
+CPPFLAGS=CPPFLAGSOLD
 
-AM_COND_IF([FOUND_XML2CONFIG_RES], [], [echo "Cannot find the xml2-config program on your system.
+# file application
+
+AC_CHECK_PROG([FOUND_FILE], [file], [yes], [no]) 
+AM_CONDITIONAL([FOUND_FILE_RES], [test x$FOUND_FILE = xyes])
+
+AM_COND_IF([FOUND_FILE_RES], [], [echo "Cannot find the file program on your system.
+If it is installed on your system, adjust your PATH environment
+variable before running configure again."
+	exit -1
+	])
+
+# uuidgen application
+
+AC_CHECK_PROG([FOUND_UUIDGEN], [uuidgen], [yes], [no]) 
+AM_CONDITIONAL([FOUND_UUIDGEN_RES], [test x$FOUND_UUIDGEN = xyes])
+
+AM_COND_IF([FOUND_UUIDGEN_RES], [], [echo "Cannot find the uuidgen program on your system.
 If it is installed on your system, adjust your PATH environment
 variable before running configure again."
 	exit -1
@@ -135,7 +167,7 @@ AC_C_INLINE
 # Setup the debug setting.
 
 AC_ARG_ENABLE([debug],
-[  --enable-debug          Enable a debugging build],
+[  --enable-debug          Enable debugging features for the build.],
 [case "${enableval}" in
 	yes) debug=true;;
 	no)  debug=false;;