X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure;h=0195dcf652bdd135c5259bc07348d10140ff9f93;hb=ad56006947ba861bd4becb66a034cc3f476882d9;hp=2ceaecff22c0e71a4664298feb6435ca8d61da5f;hpb=dae89fcb9baf7117917f808904005fd05e41a253;p=xestiaab%2F.git

diff --git a/source/configure b/source/configure
index 2ceaecf..0195dcf 100755
--- a/source/configure
+++ b/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xestia Address Book 0.01.
+# Generated by GNU Autoconf 2.69 for Xestia Address Book 0.03.
 #
 # Report bugs to <bugs@xestia.co.uk>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Xestia Address Book'
 PACKAGE_TARNAME='xestia-address-book'
-PACKAGE_VERSION='0.01'
-PACKAGE_STRING='Xestia Address Book 0.01'
+PACKAGE_VERSION='0.03'
+PACKAGE_STRING='Xestia Address Book 0.03'
 PACKAGE_BUGREPORT='bugs@xestia.co.uk'
 PACKAGE_URL=''
 
@@ -627,6 +627,18 @@ DBGSTATUS
 DBGOUT
 DEBUG_FALSE
 DEBUG_TRUE
+FOUND_UUIDGEN_RES_FALSE
+FOUND_UUIDGEN_RES_TRUE
+FOUND_UUIDGEN
+FOUND_FILE_RES_FALSE
+FOUND_FILE_RES_TRUE
+FOUND_FILE
+FOUND_XML2CONFIG_RES_FALSE
+FOUND_XML2CONFIG_RES_TRUE
+FOUND_XML2CONFIG
+FOUND_CURLCONFIG_RES_FALSE
+FOUND_CURLCONFIG_RES_TRUE
+FOUND_CURLCONFIG
 WX_VERSION_MICRO
 WX_VERSION_MINOR
 WX_VERSION_MAJOR
@@ -643,6 +655,8 @@ WX_CONFIG_PATH
 EGREP
 GREP
 CXXCPP
+BINDIR
+PREFIX
 CPP
 ac_ct_CC
 CFLAGS
@@ -1254,7 +1268,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Xestia Address Book 0.01 to adapt to many kinds of systems.
+\`configure' configures Xestia Address Book 0.03 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1316,7 +1330,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xestia Address Book 0.01:";;
+     short | recursive ) echo "Configuration of Xestia Address Book 0.03:";;
    esac
   cat <<\_ACEOF
 
@@ -1324,7 +1338,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug          Enable a debugging build
+  --enable-debug          Enable debugging features for the build.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1414,7 +1428,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xestia Address Book configure 0.01
+Xestia Address Book configure 0.03
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1845,7 +1859,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xestia Address Book $as_me 0.01, which was
+It was created by Xestia Address Book $as_me 0.03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3385,6 +3399,25 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+# 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
+
+
+if test "x$bindir" = "xNONE" ; then
+	bindir="/bin"
+fi
+BINDIR=`eval echo $bindir`
+
+
 # Checks for libraries.
 
 # wxWidgets
@@ -4182,67 +4215,6 @@ fi
 
 
 
-# ossp-uuid Library
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lossp-uuid++" >&5
-$as_echo_n "checking for main in -lossp-uuid++... " >&6; }
-if ${ac_cv_lib_ossp_uuidpp_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lossp-uuid++  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_ossp_uuidpp_main=yes
-else
-  ac_cv_lib_ossp_uuidpp_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossp_uuidpp_main" >&5
-$as_echo "$ac_cv_lib_ossp_uuidpp_main" >&6; }
-if test "x$ac_cv_lib_ossp_uuidpp_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBOSSP_UUID__ 1
-_ACEOF
-
-  LIBS="-lossp-uuid++ $LIBS"
-
-else
-  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
-
-fi
-
-
-ac_fn_cxx_check_header_mongrel "$LINENO" "ossp/uuid++.hh" "ac_cv_header_ossp_uuidpp_hh" "$ac_includes_default"
-if test "x$ac_cv_header_ossp_uuidpp_hh" = xyes; then :
-
-else
-  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
-
-fi
-
-
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4311,8 +4283,123 @@ fi
 
 
 
+# Extract the first word of "curl-config", so it can be a program name with args.
+set dummy curl-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_CURLCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FOUND_CURLCONFIG"; then
+  ac_cv_prog_FOUND_CURLCONFIG="$FOUND_CURLCONFIG" # 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_CURLCONFIG="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_CURLCONFIG" && ac_cv_prog_FOUND_CURLCONFIG="no"
+fi
+fi
+FOUND_CURLCONFIG=$ac_cv_prog_FOUND_CURLCONFIG
+if test -n "$FOUND_CURLCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_CURLCONFIG" >&5
+$as_echo "$FOUND_CURLCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$FOUND_CURLCONFIG = xyes; then
+  FOUND_CURLCONFIG_RES_TRUE=
+  FOUND_CURLCONFIG_RES_FALSE='#'
+else
+  FOUND_CURLCONFIG_RES_TRUE='#'
+  FOUND_CURLCONFIG_RES_FALSE=
+fi
+
+
+if test -z "$FOUND_CURLCONFIG_RES_TRUE"; then :
+  else
+  echo "Cannot find the curl-config program on your system.
+If it is installed on your system, adjust your PATH environment
+variable before running configure again."
+	exit -1
+
+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 :
@@ -4379,6 +4466,124 @@ fi
 done
 
 
+CPPFLAGS=CPPFLAGSOLD
+
+# file application
+
+# Extract the first word of "file", so it can be a program name with args.
+set dummy file; 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_FILE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FOUND_FILE"; then
+  ac_cv_prog_FOUND_FILE="$FOUND_FILE" # 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_FILE="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_FILE" && ac_cv_prog_FOUND_FILE="no"
+fi
+fi
+FOUND_FILE=$ac_cv_prog_FOUND_FILE
+if test -n "$FOUND_FILE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_FILE" >&5
+$as_echo "$FOUND_FILE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$FOUND_FILE = xyes; then
+  FOUND_FILE_RES_TRUE=
+  FOUND_FILE_RES_FALSE='#'
+else
+  FOUND_FILE_RES_TRUE='#'
+  FOUND_FILE_RES_FALSE=
+fi
+
+
+if test -z "$FOUND_FILE_RES_TRUE"; then :
+  else
+  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
+
+fi
+
+# uuidgen application
+
+# Extract the first word of "uuidgen", so it can be a program name with args.
+set dummy uuidgen; 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_UUIDGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FOUND_UUIDGEN"; then
+  ac_cv_prog_FOUND_UUIDGEN="$FOUND_UUIDGEN" # 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_UUIDGEN="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_UUIDGEN" && ac_cv_prog_FOUND_UUIDGEN="no"
+fi
+fi
+FOUND_UUIDGEN=$ac_cv_prog_FOUND_UUIDGEN
+if test -n "$FOUND_UUIDGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_UUIDGEN" >&5
+$as_echo "$FOUND_UUIDGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$FOUND_UUIDGEN = xyes; then
+  FOUND_UUIDGEN_RES_TRUE=
+  FOUND_UUIDGEN_RES_FALSE='#'
+else
+  FOUND_UUIDGEN_RES_TRUE='#'
+  FOUND_UUIDGEN_RES_FALSE=
+fi
+
+
+if test -z "$FOUND_UUIDGEN_RES_TRUE"; then :
+  else
+  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
+
+fi
+
 # Checks for header files.
 for ac_header in stdlib.h string.h iostream iomanip ios algorithm map vector utility
 do :
@@ -4556,7 +4761,7 @@ else
 fi
 
 if test -z "$DEBUG_TRUE"; then :
-  DBGOUT="-O0"
+  DBGOUT="-O0 -ggdb"
 
 else
   DBGOUT="-Os"
@@ -4720,6 +4925,22 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${FOUND_CURLCONFIG_RES_TRUE}" && test -z "${FOUND_CURLCONFIG_RES_FALSE}"; then
+  as_fn_error $? "conditional \"FOUND_CURLCONFIG_RES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${FOUND_XML2CONFIG_RES_TRUE}" && test -z "${FOUND_XML2CONFIG_RES_FALSE}"; then
+  as_fn_error $? "conditional \"FOUND_XML2CONFIG_RES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${FOUND_FILE_RES_TRUE}" && test -z "${FOUND_FILE_RES_FALSE}"; then
+  as_fn_error $? "conditional \"FOUND_FILE_RES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${FOUND_UUIDGEN_RES_TRUE}" && test -z "${FOUND_UUIDGEN_RES_FALSE}"; then
+  as_fn_error $? "conditional \"FOUND_UUIDGEN_RES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
   as_fn_error $? "conditional \"DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5121,7 +5342,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Xestia Address Book $as_me 0.01, which was
+This file was extended by Xestia Address Book $as_me 0.03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5174,7 +5395,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Xestia Address Book config.status 0.01
+Xestia Address Book config.status 0.03
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"