[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * configure fixes for finding binaries

git at icinga.org git at icinga.org
Thu Aug 25 08:42:14 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 34fc5778033311654f9c5ae83133fa2a47ac071f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=34fc5778033311654f9c5ae83133fa2a47ac071f

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:45:36 2011 +0200

* configure fixes for finding binaries

---

 aclocal.m4 |    7 ++++---
 configure  |   35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index f6369fe..499c9e1 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -25,9 +25,10 @@ AC_DEFUN([ACICINGA_GROUP_GUESS],[
 AC_DEFUN([ACICINGA_CHECK_BIN], [
    AC_PATH_PROG([$1],[$2],[not found])
 
-   AS_IF([ test "XX$2" == "XXnot found" ],
-	 [ AC_MSG_WARN([binary $3 not found in PATH]) ])
-    
+   AS_IF([ test "XX${$1}" == "XXnot found" ],
+	 [ AC_MSG_WARN([binary $2 not found in PATH]) ])
+
+   test "XX${$1}" == "XXnot found" && $1=""
 ])
 
 AC_DEFUN([ACICINGA_CHECK_API], [
diff --git a/configure b/configure
index 5cbe6cc..d1c4605 100755
--- a/configure
+++ b/configure
@@ -2103,11 +2103,12 @@ fi
 
 
 
-   if  test "XXphp" == "XXnot found" ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary  not found in PATH" >&5
-$as_echo "$as_me: WARNING: binary  not found in PATH" >&2;}
+   if  test "XX${PHP}" == "XXnot found" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary php not found in PATH" >&5
+$as_echo "$as_me: WARNING: binary php not found in PATH" >&2;}
 fi
 
+   test "XX${PHP}" == "XXnot found" && PHP=""
 
 
 # Check for mysql
@@ -2155,11 +2156,12 @@ fi
 
 
 
-   if  test "XXmysql" == "XXnot found" ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary  not found in PATH" >&5
-$as_echo "$as_me: WARNING: binary  not found in PATH" >&2;}
+   if  test "XX${MYSQL}" == "XXnot found" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary mysql not found in PATH" >&5
+$as_echo "$as_me: WARNING: binary mysql not found in PATH" >&2;}
 fi
 
+   test "XX${MYSQL}" == "XXnot found" && MYSQL=""
 
 
 # Check for phing
@@ -2207,11 +2209,12 @@ fi
 
 
 
-   if  test "XXphing" == "XXnot found" ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary  not found in PATH" >&5
-$as_echo "$as_me: WARNING: binary  not found in PATH" >&2;}
+   if  test "XX${PHING}" == "XXnot found" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary phing not found in PATH" >&5
+$as_echo "$as_me: WARNING: binary phing not found in PATH" >&2;}
 fi
 
+   test "XX${PHING}" == "XXnot found" && PHING=""
 
 
 # Checks for libraries.
@@ -2615,11 +2618,12 @@ fi
 
 
 
-   if  test "XX$phpunit" == "XXnot found" ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary  not found in PATH" >&5
-$as_echo "$as_me: WARNING: binary  not found in PATH" >&2;}
+   if  test "XX${PHPUNIT}" == "XXnot found" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary $phpunit not found in PATH" >&5
+$as_echo "$as_me: WARNING: binary $phpunit not found in PATH" >&2;}
 fi
 
+   test "XX${PHPUNIT}" == "XXnot found" && PHPUNIT=""
 
 
 
@@ -2675,11 +2679,12 @@ fi
 
 
 
-   if  test "XX$phpcs" == "XXnot found" ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary  not found in PATH" >&5
-$as_echo "$as_me: WARNING: binary  not found in PATH" >&2;}
+   if  test "XX${PHPCS}" == "XXnot found" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: binary $phpcs not found in PATH" >&5
+$as_echo "$as_me: WARNING: binary $phpcs not found in PATH" >&2;}
 fi
 
+   test "XX${PHPCS}" == "XXnot found" && PHPCS=""
 
 
 # Custom vars





More information about the icinga-checkins mailing list