[icinga-checkins] icinga.org: icinga-reports/master: Support #3502: Update configure script to minimum supported jaserserver version 4.5.0

git at icinga.org git at icinga.org
Sun Mar 3 17:58:17 CET 2013


Module: icinga-reports
Branch: master
Commit: 1a57d554459a7dde4e2b2fa966b9d5505001a572
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=1a57d554459a7dde4e2b2fa966b9d5505001a572

Author: Michael Luebben <michael_luebben at web.de>
Date:   Tue Dec 18 14:01:01 2012 +0100

Support #3502: Update configure script to minimum supported jaserserver version 4.5.0

---

 configure    |   23 +++++++----------------
 configure.in |    9 +++------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/configure b/configure
index b35db90..9aef9a0 100755
--- a/configure
+++ b/configure
@@ -2370,24 +2370,15 @@ else
 fi
 
 if test x$JASPER_SERVER = xno; then
-	if  test -d /opt/jasperreports-server-cp-4.0.0 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.0.0"; break;
-elif  test -d /opt/jasperreports-server-cp-4.1.0 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.1.0"; break;
-elif  test -d /opt/jasperreports-server-cp-4.2.1 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.2.1"; break;
-elif  test -d /opt/jasperreports-server-cp-4.5.0 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.5.0"; break;
+	if  test -d /opt/jasperreports-server-cp-4.5.0 ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version 4.5.0" >&5
+$as_echo "found version 4.5.0" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.5.0"; break;
 elif  test -d /opt/jasperreports-server-cp-4.7.0 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.7.0"; break;
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version 4.7.0" >&5
+$as_echo "found version 4.7.0" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.7.0"; break;
 elif  test -d /opt/jasperreports-server-cp-5.0.0 ; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-5.0.0"; break;
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version 5.0.0" >&5
+$as_echo "found version 5.0.0" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-5.0.0"; break;
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
diff --git a/configure.in b/configure.in
index eeeaf04..8bd64e9 100644
--- a/configure.in
+++ b/configure.in
@@ -50,12 +50,9 @@ JASPER_SERVER=no
 AC_MSG_CHECKING([for jasperserver])
 AC_ARG_WITH(jasper_server,AC_HELP_STRING([--with-jasper-server=<path>],[sets path to jasper server directory]),JASPER_SERVER=$withval,JASPER_SERVER=no)
 if test x$JASPER_SERVER = xno; then
-	AS_IF([ test -d /opt/jasperreports-server-cp-4.0.0 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-4.0.0"; break; ],
-	      [ test -d /opt/jasperreports-server-cp-4.1.0 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-4.1.0"; break; ],
-	      [ test -d /opt/jasperreports-server-cp-4.2.1 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-4.2.1"; break; ],
-	      [ test -d /opt/jasperreports-server-cp-4.5.0 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-4.5.0"; break; ],
-	      [ test -d /opt/jasperreports-server-cp-4.7.0 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-4.7.0"; break; ],
-	      [ test -d /opt/jasperreports-server-cp-5.0.0 ], [ AC_MSG_RESULT([found]); JASPER_SERVER="/opt/jasperreports-server-cp-5.0.0"; break; ],
+	AS_IF([ test -d /opt/jasperreports-server-cp-4.5.0 ], [ AC_MSG_RESULT([found version 4.5.0]); JASPER_SERVER="/opt/jasperreports-server-cp-4.5.0"; break; ],
+	      [ test -d /opt/jasperreports-server-cp-4.7.0 ], [ AC_MSG_RESULT([found version 4.7.0]); JASPER_SERVER="/opt/jasperreports-server-cp-4.7.0"; break; ],
+	      [ test -d /opt/jasperreports-server-cp-5.0.0 ], [ AC_MSG_RESULT([found version 5.0.0]); JASPER_SERVER="/opt/jasperreports-server-cp-5.0.0"; break; ],
               [ AC_MSG_RESULT([not found]) ])
 fi
 AC_SUBST(JASPER_SERVER)





More information about the icinga-checkins mailing list