[icinga-checkins] icinga.org: icinga-core/next: install: add --enable-classicui-standalone

git at icinga.org git at icinga.org
Sat Apr 13 15:54:34 CEST 2013


Module: icinga-core
Branch: next
Commit: b805935bc5655547c53bd618fce7fa4ba10a45ed
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b805935bc5655547c53bd618fce7fa4ba10a45ed

Author: Michael Friedrich <Michael.Friedrich at netways.de>
Date:   Sat Apr 13 14:37:52 2013 +0200

install: add --enable-classicui-standalone

refs #3869

---

 Changelog                |    2 ++
 configure                |   20 ++++++++++++++++++++
 configure.in             |   11 +++++++++++
 sample-config/cgi.cfg.in |    2 +-
 subst.in                 |    1 +
 5 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 510387a..1b2574c 100644
--- a/Changelog
+++ b/Changelog
@@ -127,6 +127,8 @@ CHANGES
 	** this is important when installing standalone classic ui for e.g. Icinga2
 * install: make install-webconf installs htpasswd.users, allowing default icingaadmin login out-of-the-box #3963
 	** can be invoked with install-webconf-auth standalone too
+* install: add --enable-classicui-standalone #3869
+	** sets cgi.cfg standalone_installation=1
 
 
 1.8.4 - 13/01/2013
diff --git a/configure b/configure
index 248850f..6f7a3ee 100755
--- a/configure
+++ b/configure
@@ -647,6 +647,7 @@ ido2db_name
 icingastats_name
 icinga_name
 LIBDBIDRIVERDIR
+CLASSICUI_STANDALONE_FLAG
 DBLIBS
 IDO_INSTANCE_NAME
 BROKER_H
@@ -817,6 +818,7 @@ with_pgsql_lib
 with_psql_inc
 with_dbi_lib
 with_dbi_inc
+enable_classicui_standalone
 with_libdbi_driver_dir
 enable_embedded_perl
 with_perlcache
@@ -1459,6 +1461,8 @@ Optional Features:
   --enable-oracle         enables idoutils with ocilib and oracle
   --enable-pgsql          !use libdbis pgsql support instead, libpq not yet
                           implemented! enables idoutils with libpq and pgsql
+  --enable-classicui-standalone
+                          enables standalone Classic UI (default: disabled)
   --enable-embedded-perl  will enable embedded Perl interpreter
   --enable-cygwin         enables building under the CYGWIN environment
   --enable-libtap         this is deprecated, libtap is built with make test
@@ -6769,6 +6773,22 @@ _ACEOF
 	fi
 fi
 
+CLASSICUI_STANDALONE=no
+# Check whether --enable-classicui-standalone was given.
+if test "${enable_classicui_standalone+set}" = set; then :
+  enableval=$enable_classicui_standalone; CLASSICUI_STANDALONE=$enableval
+else
+  CLASSICUI_STANDALONE=no
+fi
+
+if test x$CLASSICUI_STANDALONE = xyes; then
+	CLASSICUI_STANDALONE_FLAG="1"
+fi
+if test x$CLASSICUI_STANDALONE = xno; then
+	CLASSICUI_STANDALONE_FLAG="0"
+fi
+
+
 LIBDBIDRIVERDIR=no
 
 # Check whether --with-libdbi-driver-dir was given.
diff --git a/configure.in b/configure.in
index 1b148eb..2d6bc09 100644
--- a/configure.in
+++ b/configure.in
@@ -1005,6 +1005,17 @@ if test x$USE_IDOUTILS = xyes; then
 	fi
 fi
 
+dnl Classic UI Standalone
+CLASSICUI_STANDALONE=no
+AC_ARG_ENABLE(classicui-standalone,AC_HELP_STRING([--enable-classicui-standalone],[enables standalone Classic UI (default: disabled)]),CLASSICUI_STANDALONE=$enableval,CLASSICUI_STANDALONE=no)
+if test x$CLASSICUI_STANDALONE = xyes; then
+	CLASSICUI_STANDALONE_FLAG="1"
+fi
+if test x$CLASSICUI_STANDALONE = xno; then
+	CLASSICUI_STANDALONE_FLAG="0"
+fi
+AC_SUBST(CLASSICUI_STANDALONE_FLAG)
+
 dnl Location of temp path
 LIBDBIDRIVERDIR=no
 AC_ARG_WITH(libdbi-driver-dir,AC_HELP_STRING([--with-libdbi-driver-dir=<path>],[sets path to libdbi driver directory path (only valid with libdbi, not oracle ocilib)]),LIBDBIDRIVERDIR=$withval,LIBDBIDRIVERDIR=no)
diff --git a/sample-config/cgi.cfg.in b/sample-config/cgi.cfg.in
index 40683de..67aa98a 100644
--- a/sample-config/cgi.cfg.in
+++ b/sample-config/cgi.cfg.in
@@ -28,7 +28,7 @@ main_config_file=@sysconfdir@/icinga.cfg
 # NOTE: Check also the "Icinga 2 section" at the bottom if
 #       this is switched on!
 
-standalone_installation=0
+standalone_installation=@CLASSICUI_STANDALONE_FLAG@
 
 
 
diff --git a/subst.in b/subst.in
index de8a154..4720dad 100755
--- a/subst.in
+++ b/subst.in
@@ -44,6 +44,7 @@ while ($f = shift @ARGV) {
 		s|\@IDO_INSTANCE_NAME\@|@IDO_INSTANCE_NAME@|g;
 		s|\@CHECKRESULTDIR\@|@CHECKRESULTDIR@|g;
 		s|\@LIBDBIDRIVERDIR\@|@LIBDBIDRIVERDIR@|g;
+		s|\@CLASSICUI_STANDALONE_FLAG\@|@CLASSICUI_STANDALONE_FLAG@|g;
 		s|\@datadir\@|@datarootdir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;





More information about the icinga-checkins mailing list