From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Tue, 20 Oct 2015 19:29:01 +0000 (+0100)
Subject: Updated build system to look for file and support for more Linux-based OSes.
X-Git-Tag: release-0.05~28
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=a117b08db467757f5920a4cc5791f89a3b5d830c;p=xestiaab%2F.git

Updated build system to look for file and support for more Linux-based OSes.
---

diff --git a/source/Makefile.in b/source/Makefile.in
index 7edf2e0..a2b25c7 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,6 +1,7 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -96,7 +97,8 @@ BMCOOBJS=tools/bitmapcode.o
 xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \
 	ceobjs mainobjs searchobjs imexobjs 
 	$(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT)
+	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
+	$(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
@@ -133,7 +135,7 @@ distclean: clean
 bitmaphelperobjs: $(BMCOOBJS)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)
+	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
 install:
diff --git a/source/configure b/source/configure
index 5dee0e5..8dff3da 100755
--- a/source/configure
+++ b/source/configure
@@ -630,6 +630,9 @@ 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
@@ -4460,6 +4463,64 @@ variable before running configure again."
 
 fi
 
+# 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.
@@ -4867,6 +4928,10 @@ if test -z "${FOUND_XML2CONFIG_RES_TRUE}" && test -z "${FOUND_XML2CONFIG_RES_FAL
   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
diff --git a/source/configure.ac b/source/configure.ac
index 16eb213..9a51688 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -130,6 +130,17 @@ variable before running configure again."
 	exit -1
 	])
 
+# 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])