From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Fri, 25 Sep 2015 22:03:16 +0000 (+0100)
Subject: Updated build system
X-Git-Tag: release-0.05~58
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=5ee17950e2c44804fbaf660837f88d725136b978;p=xestiaab%2F.git

Updated build system
---

diff --git a/source/Makefile.in b/source/Makefile.in
index b27ce6a..17383a6 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,6 +1,6 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lossp-uuid++ -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@ -ggdb
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lossp-uuid++ -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
diff --git a/source/configure b/source/configure
index 2ceaecf..9cc227f 100755
--- a/source/configure
+++ b/source/configure
@@ -627,6 +627,12 @@ DBGSTATUS
 DBGOUT
 DEBUG_FALSE
 DEBUG_TRUE
+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
@@ -4311,6 +4317,62 @@ 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
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml2" >&5
@@ -4379,6 +4441,62 @@ 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
+
 # Checks for header files.
 for ac_header in stdlib.h string.h iostream iomanip ios algorithm map vector utility
 do :
@@ -4556,7 +4674,7 @@ else
 fi
 
 if test -z "$DEBUG_TRUE"; then :
-  DBGOUT="-O0"
+  DBGOUT="-O0 -ggdb"
 
 else
   DBGOUT="-Os"
@@ -4720,6 +4838,14 @@ 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 "${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
diff --git a/source/configure.ac b/source/configure.ac
index cec6ce6..6e792d3 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -93,6 +93,15 @@ before running configure again."
 	exit -1
 	])
 
+AC_CHECK_PROG([FOUND_CURLCONFIG], [curl-config], [yes], [no]) 
+AM_CONDITIONAL([FOUND_CURLCONFIG_RES], [test x$FOUND_CURLCONFIG = xyes])
+
+AM_COND_IF([FOUND_CURLCONFIG_RES], [], [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
+	])
+
 # libxml2 Library
 
 AC_CHECK_LIB([xml2], [main], [], [echo "The libxml2 library must be installed on your system.
@@ -107,6 +116,15 @@ 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
+	])
+
 # Checks for header files.
 AC_CHECK_HEADERS([stdlib.h string.h iostream iomanip ios algorithm map vector utility])
 
@@ -127,7 +145,7 @@ AC_ARG_ENABLE([debug],
 # Checks for library functions.
 
 AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
-AM_COND_IF([DEBUG], [AC_SUBST([DBGOUT], ["-O0"])], [AC_SUBST([DBGOUT], ["-Os"])])
+AM_COND_IF([DEBUG], [AC_SUBST([DBGOUT], ["-O0 -ggdb"])], [AC_SUBST([DBGOUT], ["-Os"])])
 AM_COND_IF([DEBUG], [AC_SUBST([DBGSTATUS], ["DEBUG=true"])], [AC_SUBST([DBGSTATUS], ["DEBUG=false"])])
 AM_COND_IF([DEBUG], [echo "Debugging mode has been enabled."])