[icinga-checkins] icinga.org: icinga-web/jmosshammer/default2: * Added --with-web-path to Makefile

git at icinga.org git at icinga.org
Fri May 28 13:44:21 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 26 16:12:06 2010 +0200

* Added --with-web-path to Makefile

---

 Makefile.in                     |    4 ++-
 configure                       |   54 +++++++++++++++++++++++++++-----------
 configure.ac                    |    8 ++++++
 pub/{.htaccess => .htaccess.in} |    4 +-
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 9ab6012..9a93eb6 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@ BIN_USER=@bin_user@
 BIN_GROUP=@bin_group@
 WEB_USER=@web_user@
 WEB_GROUP=@web_group@
+WEB_PATH=@web_path@
 SED=@SED@
 PHP=@PHP@
 PHING=@PHING@
@@ -65,7 +66,8 @@ distclean: clean
 		
 configclean:
 	rm -f \
-		app/config/databases.xml
+		app/config/databases.xml \
+		pub/.htaccess
 
 remove-temp-files:
 	bin/rmtmp-files.sh
diff --git a/configure b/configure
index 380d902..7d5216e 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for icinga-web 0.9.1-beta.
+# Generated by GNU Autoconf 2.65 for icinga-web 0.9.1-beta.
 #
 # Report bugs to <dev.icinga.org>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -527,7 +529,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -568,6 +571,7 @@ db_host
 db_type
 bin_group
 bin_user
+web_path
 web_group
 web_user
 PHING
@@ -621,6 +625,7 @@ ac_user_opts='
 enable_option_checking
 with_web_user
 with_web_group
+with_web_path
 with_bin_user
 with_bin_group
 with_icinga_api
@@ -1248,6 +1253,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-web-user=<user>  username for web writable files (default www-data)
   --with-web-group=<grp>  group for web writable files (default www-data)
+  --with-web-path=<path>  web sub path (default /icinga-web)
   --with-bin-user=<user>  user for all other files (default root)
   --with-bin-group=<grp>  group for all other files (default bin)
   --with-icinga-api=<string>
@@ -1331,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 icinga-web configure 0.9.1-beta
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1348,7 +1354,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by icinga-web $as_me 0.9.1-beta, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1601,7 +1607,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -1610,9 +1616,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2161,6 +2167,16 @@ fi
 
 
 
+# Check whether --with-web_path was given.
+if test "${with_web_path+set}" = set; then :
+  withval=$with_web_path; web_path=$withval
+else
+  web_path=/icinga-web
+
+fi
+
+
+
 # Check whether --with-bin_user was given.
 if test "${with_bin_user+set}" = set; then :
   withval=$with_bin_user; bin_user=$withval
@@ -2289,7 +2305,8 @@ CFLAGS=""
 
 
 
-ac_config_files="$ac_config_files Makefile etc/build.properties app/config/databases.xml"
+
+ac_config_files="$ac_config_files Makefile etc/build.properties app/config/databases.xml pub/.htaccess"
 
 
 cat >confcache <<\_ACEOF
@@ -2834,7 +2851,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by icinga-web $as_me 0.9.1-beta, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2869,6 +2886,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -2883,10 +2901,11 @@ Report bugs to <dev.icinga.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 icinga-web config.status 0.9.1-beta
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -2922,6 +2941,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -2990,6 +3011,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
     "app/config/databases.xml") CONFIG_FILES="$CONFIG_FILES app/config/databases.xml" ;;
+    "pub/.htaccess") CONFIG_FILES="$CONFIG_FILES pub/.htaccess" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -3091,7 +3113,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3105,7 +3127,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff --git a/configure.ac b/configure.ac
index d953696..27e20d3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,12 @@ AC_ARG_WITH([web_group],
 	ACICINGA_GROUP_GUESS([www www-data apache httpd nogroup nobody],[web_group], [www-data])
 )
 
+AC_ARG_WITH([web_path],
+	AS_HELP_STRING([--with-web-path=<path>], [web sub path (default /icinga-web)]),
+	web_path=$withval,
+	web_path=/icinga-web
+)
+
 AC_ARG_WITH([bin_user],
 	AS_HELP_STRING([--with-bin-user=<user>], [user for all other files (default root)]),
 	bin_user=$withval,
@@ -114,6 +120,7 @@ CFLAGS=""
 # Substitutions
 AC_SUBST(web_user)
 AC_SUBST(web_group)
+AC_SUBST(web_path)
 AC_SUBST(bin_user)
 AC_SUBST(bin_group)
 
@@ -136,6 +143,7 @@ AC_CONFIG_FILES([
 	Makefile
 	etc/build.properties
 	app/config/databases.xml
+	pub/.htaccess
 ])
 
 AC_OUTPUT
diff --git a/pub/.htaccess b/pub/.htaccess.in
similarity index 97%
rename from pub/.htaccess
rename to pub/.htaccess.in
index 6baa212..a2f6072 100755
--- a/pub/.htaccess
+++ b/pub/.htaccess.in
@@ -11,7 +11,7 @@ Allow from all
     
     # This depends on your path
     # on independent hosts the base is '/'
-    RewriteBase /icinga-web
+    RewriteBase @web_path@
 	
 	# If the requested URL does not exist (it's likely an agavi route),
 	# pass it as path info to index.php, the Agavi dispatch script.
@@ -48,4 +48,4 @@ Allow from all
 	AcceptPathInfo On
 </IfDefine>
 
-# [EOF]
\ No newline at end of file
+# [EOF]





More information about the icinga-checkins mailing list