diff --git a/config/backends.ini b/config/backends.ini
deleted file mode 100755
index 50b6a1b6a..000000000
--- a/config/backends.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[localdb]
-type = ido
-host = localhost
-user = "icinga"
-pass = "icinga"
-db = "icinga"
-
-[locallive]
-type = livestatus
-socket = "/var/lib/icinga/rw/live"
-
-[localfile]
-type = statusdat
-status_file = "/usr/local/icinga/var/status.dat"
-objects_file = "/usr/local/icinga/var/objects.cache"
-
-[localfailsafe]
-type = combo
-backends = localdb, locallive, localfile
\ No newline at end of file
diff --git a/config/modules/monitoring/backends.ini b/config/modules/monitoring/backends.ini
index 3fabbbf5d..a3296d8d9 100644
--- a/config/modules/monitoring/backends.ini
+++ b/config/modules/monitoring/backends.ini
@@ -1,9 +1,20 @@
-
 [localdb]
 type = ido
-host = localhost
-user = "icinga-idoutils"
-pass = "***"
-db = "icinga"
+resource = "ido-mysql"
+disabled = 0
 
+[locallive]
+type = livestatus
+socket = "/var/lib/icinga/rw/live"
+disabled = 0
 
+[localfile]
+type = statusdat
+status_file = "/usr/local/icinga/var/status.dat"
+objects_file = "/usr/local/icinga/var/objects.cache"
+disabled = 0
+
+[localfailsafe]
+type = combo
+backends = localdb, locallive, localfile
+disabled = 0
diff --git a/config/backends.ini.in b/config/modules/monitoring/backends.ini.in
old mode 100755
new mode 100644
similarity index 76%
rename from config/backends.ini.in
rename to config/modules/monitoring/backends.ini.in
index 21cd66377..2d33fcecc
--- a/config/backends.ini.in
+++ b/config/modules/monitoring/backends.ini.in
@@ -1,10 +1,6 @@
 [localdb]
 type = ido
-host = @ido_host@
-port = @ido_port@
-user = @ido_user@
-pass = @ido_password@
-db = @ido_database@
+resource = "ido"
 @ido_enabled@
 
 [locallive]
@@ -22,4 +18,3 @@ objects_file = @objects_cache_file@
 ;enabled=false
 ;type = combo
 ;backends = localdb, locallive, localfile
-
diff --git a/config/resources.ini b/config/resources.ini
index b45ef51e6..2b4a80f4a 100644
--- a/config/resources.ini
+++ b/config/resources.ini
@@ -14,7 +14,7 @@
 
 
 [icingaweb-pgsql]
-type	 	        = db
+type                = db
 db                  = pgsql         ; PostgreSQL
 host                = localhost
 password            = icinga
@@ -29,10 +29,20 @@ password            = icinga
 username            = icingaweb
 dbname              = icingaweb
 
-[ido]
-type		        = db
-dbname              = mysql
-host		        = localhost
-password	        = icinga
-username            = icingaweb
-db  		        = icingaweb
\ No newline at end of file
+[ido-pgsql]
+type                = db
+db                  = pgsql         ; PostgreSQL
+host                = localhost
+password            = icinga
+username            = icinga
+port                = 5432
+dbname              = icinga
+
+[ido-mysql]
+type                = db
+db                  = mysql         ; MySQL
+host                = localhost
+password            = icinga
+username            = icinga
+port                = 3306
+dbname              = icinga
\ No newline at end of file
diff --git a/config/resources.ini.in b/config/resources.ini.in
new file mode 100644
index 000000000..dedfa61b6
--- /dev/null
+++ b/config/resources.ini.in
@@ -0,0 +1,39 @@
+; resources.ini
+;
+; The configuration file *resources.ini* contains data sources that
+; can be referenced in other configurations. This allows you to manage
+; all connections to SQL databases in one single place, avoiding the need
+: to edit several different configuration files, when the connection
+; information of a resource change.
+;
+; Each section represents a resource, with the section name being the
+; identifier used to reference this certain section. Depending on the
+; resource type, each section contains different properties. The property
+; *type* defines the resource type and thus how the properties are going to
+; be interpreted. Currently only the resource type *db* is available.
+
+
+[icingaweb-pgsql]
+type                = db
+db                  = pgsql         ; PostgreSQL
+host                = localhost
+password            = icinga
+username            = icingaweb
+dbname              = icingaweb
+
+[icingaweb-mysql]
+type                = db
+db                  = mysql         ; MySQL
+host                = localhost
+password            = icinga
+username            = icingaweb
+dbname              = icingaweb
+
+[ido]
+type                = db
+db                  = @ido_db_type@
+host                = @ido_host@
+password            = @ido_user@
+username            = @ido_user@
+port                = @ido_port@
+dbname              = @ido_database@
diff --git a/configure b/configure
index b157a9567..3e077c413 100755
--- a/configure
+++ b/configure
@@ -1,18 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Icinga2Web 0.0.1.
+# Generated by GNU Autoconf 2.69 for Icinga2Web 1.0.0.
+#
+# Report bugs to <info@icinga.org>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -44,7 +40,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +57,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -94,15 +89,16 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -114,12 +110,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,7 +131,294 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and info@icinga.org
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -145,8 +432,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -166,295 +457,19 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -471,9 +486,12 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -482,29 +500,18 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -519,49 +526,29 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,11 +557,11 @@ 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,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -589,14 +576,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='Icinga2Web'
 PACKAGE_TARNAME='icinga2web'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='Icinga2Web 0.0.1'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='1.0.0'
+PACKAGE_STRING='Icinga2Web 1.0.0'
+PACKAGE_BUGREPORT='info@icinga.org'
+PACKAGE_URL=''
 
 ac_default_prefix=/usr/local/icinga2-web
 ac_subst_vars='LTLIBOBJS
@@ -679,6 +666,7 @@ bindir
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -792,8 +780,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -838,8 +827,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -865,8 +853,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1070,8 +1057,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1087,8 +1073,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1118,17 +1103,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1137,7 +1122,7 @@ Try \`$0 --help' for more information." >&2
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1145,15 +1130,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1176,8 +1159,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1191,8 +1173,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1207,11 +1187,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1250,13 +1228,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1282,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Icinga2Web 0.0.1 to adapt to many kinds of systems.
+\`configure' configures Icinga2Web 1.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1296,7 +1272,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1343,7 +1319,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Icinga2Web 0.0.1:";;
+     short | recursive ) echo "Configuration of Icinga2Web 1.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1448,6 +1424,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <info@icinga.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1510,22 +1487,25 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Icinga2Web configure 0.0.1
-generated by GNU Autoconf 2.63
+Icinga2Web configure 1.0.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Icinga2Web $as_me 0.0.1, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by Icinga2Web $as_me 1.0.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -1561,8 +1541,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1599,9 +1579,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1617,13 +1597,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1635,11 +1615,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1648,13 +1626,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1673,11 +1651,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1690,11 +1666,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1708,11 +1682,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1726,46 +1698,53 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1776,19 +1755,23 @@ 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
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  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
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 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
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # 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
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1796,7 +1779,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1811,11 +1794,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1825,17 +1808,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1847,43 +1830,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1919,9 +1879,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1947,10 +1905,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1958,11 +1916,11 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1970,7 +1928,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1999,7 +1957,7 @@ case $as_dir/ in
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -2015,7 +1973,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2026,9 +1984,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -2039,10 +1997,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -2059,7 +2017,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -2074,26 +2032,24 @@ esac
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -2101,7 +2057,7 @@ else
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
+     { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -2110,10 +2066,10 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -2130,7 +2086,7 @@ case `"$ac_path_SED" --version 2>&1` in
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -2145,19 +2101,17 @@ esac
       $ac_path_SED_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -2166,39 +2120,33 @@ $as_echo "$ac_cv_path_SED" >&6; }
 # Check for php
 
 
-  { $as_echo "$as_me:$LINENO: checking if PHP runtime dependency 'Zend Framework' is available" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PHP runtime dependency 'Zend Framework' is available" >&5
 $as_echo_n "checking if PHP runtime dependency 'Zend Framework' is available... " >&6; }
-  if  php -r 'require "Zend/Application.php";' ; then
-   { $as_echo "$as_me:$LINENO: result: PHP runtime dependency fulfilled" >&5
+  if  php -r 'require "Zend/Application.php";' ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP runtime dependency fulfilled" >&5
 $as_echo "PHP runtime dependency fulfilled" >&6; }
 else
-    { { $as_echo "$as_me:$LINENO: error: PHP runtime dependency 'Zend Framework' is missing" >&5
-$as_echo "$as_me: error: PHP runtime dependency 'Zend Framework' is missing" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "PHP runtime dependency 'Zend Framework' is missing" "$LINENO" 5
 fi
 
 
-
-  { $as_echo "$as_me:$LINENO: checking if php has at least version 5.3.0" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has at least version 5.3.0" >&5
 $as_echo_n "checking if php has at least version 5.3.0... " >&6; }
   if    test 5 -le `php -r 'echo PHP_MAJOR_VERSION;'` && \
             test 3 -le `php -r 'echo PHP_MINOR_VERSION;'` && \
-            test 0 -le `php -r 'echo PHP_RELEASE_VERSION;'`; then
-   { $as_echo "$as_me:$LINENO: result: PHP version is correct" >&5
+            test 0 -le `php -r 'echo PHP_RELEASE_VERSION;'`; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP version is correct" >&5
 $as_echo "PHP version is correct" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: You need at least PHP version 5.3.0" >&5
-$as_echo "$as_me: error: You need at least PHP version 5.3.0" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "You need at least PHP version 5.3.0" "$LINENO" 5
 fi
 
 
-
    # Extract the first word of "php", so it can be a program name with args.
 set dummy php; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PHP+set}" = set; then
+if ${ac_cv_path_PHP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PHP in
@@ -2211,14 +2159,14 @@ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PHP" && ac_cv_path_PHP="not found"
@@ -2227,48 +2175,43 @@ esac
 fi
 PHP=$ac_cv_path_PHP
 if test -n "$PHP"; then
-  { $as_echo "$as_me:$LINENO: result: $PHP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
 $as_echo "$PHP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
-   if  test "XX${PHP}" == "XXnot found" ; then
-   { $as_echo "$as_me:$LINENO: WARNING: binary php not found in PATH" >&5
+   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=""
 
 
 # Checks for libraries.
 
-
   for x in sockets json;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
 
-# Checks for header files.
-
-
+#
+#   Configuration files
+#
 
 # Check whether --with-icinga2web_config_path was given.
-if test "${with_icinga2web_config_path+set}" = set; then
+if test "${with_icinga2web_config_path+set}" = set; then :
   withval=$with_icinga2web_config_path; icinga2web_config_path="'$withval'"
 else
   icinga2web_config_path="'$prefix/config/'"
@@ -2276,27 +2219,27 @@ else
 fi
 
 
-# Users for webfiles
+#
+#   Users for webfiles
 #
 
 
 # Check whether --with-web_user was given.
-if test "${with_web_user+set}" = set; then
+if test "${with_web_user+set}" = set; then :
   withval=$with_web_user; web_user=$withval
 else
 
    web_user=www-data
    for x in www wwwrun www-data apache httpd nobody; do
-    { $as_echo "$as_me:$LINENO: checking if user $x exists" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if user $x exists" >&5
 $as_echo_n "checking if user $x exists... " >&6; }
-     if  $GREP -q "^$x:" /etc/passwd ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  $GREP -q "^$x:" /etc/passwd ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }; web_user=$x ; break
 else
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 fi
-
    done
 
 
@@ -2305,22 +2248,21 @@ fi
 
 
 # Check whether --with-web_group was given.
-if test "${with_web_group+set}" = set; then
+if test "${with_web_group+set}" = set; then :
   withval=$with_web_group; web_group=$withval
 else
 
    web_group=www-data
    for x in www www-data apache httpd nogroup nobody; do
-     { $as_echo "$as_me:$LINENO: checking if group $x exists" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if group $x exists" >&5
 $as_echo_n "checking if group $x exists... " >&6; }
-     if  $GREP -q "^$x:" /etc/group ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  $GREP -q "^$x:" /etc/group ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }; web_group=$x ; break
 else
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 fi
-
    done
 
 
@@ -2329,7 +2271,7 @@ fi
 
 
 # Check whether --with-web_path was given.
-if test "${with_web_path+set}" = set; then
+if test "${with_web_path+set}" = set; then :
   withval=$with_web_path; web_path=$withval
 else
   web_path=/cranberry
@@ -2339,23 +2281,22 @@ fi
 
 
 # Check whether --with-www_conf_path was given.
-if test "${with_www_conf_path+set}" = set; then
+if test "${with_www_conf_path+set}" = set; then :
   withval=$with_www_conf_path; www_conf_path=$withval
 else
   www_conf_path=
     www_conf_path=/etc/apache2/conf.d
     for x in /etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d; do
-        { $as_echo "$as_me:$LINENO: checking if path $x exists" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if path $x exists" >&5
 $as_echo_n "checking if path $x exists... " >&6; }
-        if test -d $x; then
-  { $as_echo "$as_me:$LINENO: result: found" >&5
+        if test -d $x; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }; www_conf_path=$x; break
 else
-  { $as_echo "$as_me:$LINENO: result: not found" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 
 fi
-
     done
 
 
@@ -2368,7 +2309,7 @@ fi
 
 
 # Check whether --with-bin_user was given.
-if test "${with_bin_user+set}" = set; then
+if test "${with_bin_user+set}" = set; then :
   withval=$with_bin_user; bin_user=$withval
 else
   bin_user=root
@@ -2378,7 +2319,7 @@ fi
 
 
 # Check whether --with-bin_group was given.
-if test "${with_bin_group+set}" = set; then
+if test "${with_bin_group+set}" = set; then :
   withval=$with_bin_group; bin_group=$withval
 else
   bin_group=bin
@@ -2392,7 +2333,7 @@ fi
 
 
 # Check whether --with-internal_db_type was given.
-if test "${with_internal_db_type+set}" = set; then
+if test "${with_internal_db_type+set}" = set; then :
   withval=$with_internal_db_type; internal_db_type=$withval
 else
   internal_db_type=mysql
@@ -2402,7 +2343,7 @@ fi
 
 
 # Check whether --with-internal_db_name was given.
-if test "${with_internal_db_name+set}" = set; then
+if test "${with_internal_db_name+set}" = set; then :
   withval=$with_internal_db_name; internal_db_name=$withval
 else
   internal_db_name=icinga2web
@@ -2412,7 +2353,7 @@ fi
 
 
 # Check whether --with-internal_db_host was given.
-if test "${with_internal_db_host+set}" = set; then
+if test "${with_internal_db_host+set}" = set; then :
   withval=$with_internal_db_host; internal_db_host=$withval
 else
   internal_db_host=localhost
@@ -2422,7 +2363,7 @@ fi
 
 
 # Check whether --with-internal_db_port was given.
-if test "${with_internal_db_port+set}" = set; then
+if test "${with_internal_db_port+set}" = set; then :
   withval=$with_internal_db_port; internal_db_port=$withval
 else
   internal_db_port=db_default_port
@@ -2432,7 +2373,7 @@ fi
 
 
 # Check whether --with-internal_db_pass was given.
-if test "${with_internal_db_pass+set}" = set; then
+if test "${with_internal_db_pass+set}" = set; then :
   withval=$with_internal_db_pass; internal_db_pass=$withval
 else
   internal_db_pass=icinga2web
@@ -2442,7 +2383,7 @@ fi
 
 
 # Check whether --with-internal_db_user was given.
-if test "${with_internal_db_user+set}" = set; then
+if test "${with_internal_db_user+set}" = set; then :
   withval=$with_internal_db_user; internal_db_user=$withval
 else
   internal_db_user=icinga2web
@@ -2453,11 +2394,10 @@ fi
 #
 #   Authorization method
 #
-#
 
 
 # Check whether --with-internal_authentication was given.
-if test "${with_internal_authentication+set}" = set; then
+if test "${with_internal_authentication+set}" = set; then :
   withval=$with_internal_authentication; internal_authentication=yes
 else
   internal_authentication=def
@@ -2467,7 +2407,7 @@ fi
 
 
 # Check whether --with-ldap_authentication was given.
-if test "${with_ldap_authentication+set}" = set; then
+if test "${with_ldap_authentication+set}" = set; then :
   withval=$with_ldap_authentication; ldap_authentication=yes
 else
   ldap_authentication=no
@@ -2481,7 +2421,7 @@ fi
 
 
 # Check whether --with-ldap_host was given.
-if test "${with_ldap_host+set}" = set; then
+if test "${with_ldap_host+set}" = set; then :
   withval=$with_ldap_host; ldap_host=$withval
 else
   ldap_host=localhost
@@ -2491,7 +2431,7 @@ fi
 
 
 # Check whether --with-ldap_port was given.
-if test "${with_ldap_port+set}" = set; then
+if test "${with_ldap_port+set}" = set; then :
   withval=$with_ldap_port; ldap_port=$withval
 else
   ldap_port=389
@@ -2501,7 +2441,7 @@ fi
 
 
 # Check whether --with-ldap_binddn was given.
-if test "${with_ldap_binddn+set}" = set; then
+if test "${with_ldap_binddn+set}" = set; then :
   withval=$with_ldap_binddn; ldap_binddn=$withval
 else
   ldap_binddn="cn=Manager, ou=icinga, ou=org"
@@ -2511,7 +2451,7 @@ fi
 
 
 # Check whether --with-ldap_bindpass was given.
-if test "${with_ldap_bindpass+set}" = set; then
+if test "${with_ldap_bindpass+set}" = set; then :
   withval=$with_ldap_bindpass; ldap_bindpass=$withval
 else
   ldap_bindpass="secret"
@@ -2521,7 +2461,7 @@ fi
 
 
 # Check whether --with-ldap_rootdn was given.
-if test "${with_ldap_rootdn+set}" = set; then
+if test "${with_ldap_rootdn+set}" = set; then :
   withval=$with_ldap_rootdn; ldap_rootdn=$withval
 else
   ldap_rootdn="ou=people, dc=icinga, dc=org"
@@ -2531,7 +2471,7 @@ fi
 
 
 # Check whether --with-ldap_user_objectclass was given.
-if test "${with_ldap_user_objectclass+set}" = set; then
+if test "${with_ldap_user_objectclass+set}" = set; then :
   withval=$with_ldap_user_objectclass; ldap_user_objectclass=$withval
 else
   ldap_user_objectclass="inetOrgPerson"
@@ -2541,7 +2481,7 @@ fi
 
 
 # Check whether --with-ldap_attribute_username was given.
-if test "${with_ldap_attribute_username+set}" = set; then
+if test "${with_ldap_attribute_username+set}" = set; then :
   withval=$with_ldap_attribute_username; ldap_attribute_username=$withval
 else
   ldap_attribute_username="uid"
@@ -2551,7 +2491,7 @@ fi
 
 
 # Check whether --with-ldap_attribute_password was given.
-if test "${with_ldap_attribute_password+set}" = set; then
+if test "${with_ldap_attribute_password+set}" = set; then :
   withval=$with_ldap_attribute_password; ldap_attribute_password=$withval
 else
   ldap_attribute_password="password"
@@ -2561,7 +2501,7 @@ fi
 
 
 # Check whether --with-ldap_group_objectclass was given.
-if test "${with_ldap_group_objectclass+set}" = set; then
+if test "${with_ldap_group_objectclass+set}" = set; then :
   withval=$with_ldap_group_objectclass; ldap_group_objectclass=$withval
 else
   ldap_group_objectclass="group"
@@ -2571,7 +2511,7 @@ fi
 
 
 # Check whether --with-ldap_attribute_groupname was given.
-if test "${with_ldap_attribute_groupname+set}" = set; then
+if test "${with_ldap_attribute_groupname+set}" = set; then :
   withval=$with_ldap_attribute_groupname; ldap_attribute_groupname=$withval
 else
   ldap_attribute_groupname="guid"
@@ -2579,14 +2519,13 @@ else
 fi
 
 
-
 #
 #   Icinga backend selection
 #
 
 
 # Check whether --with-icinga_backend was given.
-if test "${with_icinga_backend+set}" = set; then
+if test "${with_icinga_backend+set}" = set; then :
   withval=$with_icinga_backend; icinga_backend=$withval
 else
   icinga_backend="statusdat"
@@ -2600,17 +2539,17 @@ fi
 
 
 # Check whether --with-ido_db_type was given.
-if test "${with_ido_db_type+set}" = set; then
+if test "${with_ido_db_type+set}" = set; then :
   withval=$with_ido_db_type; ido_db_type=$withval
 else
-  ido_db_type="statusdat"
+  ido_db_type="mysql"
 
 fi
 
 
 
 # Check whether --with-ido_host was given.
-if test "${with_ido_host+set}" = set; then
+if test "${with_ido_host+set}" = set; then :
   withval=$with_ido_host; ido_host=$withval
 else
   ido_host="localhost"
@@ -2620,7 +2559,7 @@ fi
 
 
 # Check whether --with-ido_port was given.
-if test "${with_ido_port+set}" = set; then
+if test "${with_ido_port+set}" = set; then :
   withval=$with_ido_port; ido_port=$withval
 else
   ido_port=db_default_port
@@ -2629,9 +2568,8 @@ fi
 
 
 
-
 # Check whether --with-ido_database was given.
-if test "${with_ido_database+set}" = set; then
+if test "${with_ido_database+set}" = set; then :
   withval=$with_ido_database; ido_database=$withval
 else
   ido_database="icinga"
@@ -2640,9 +2578,8 @@ fi
 
 
 
-
 # Check whether --with-ido_user was given.
-if test "${with_ido_user+set}" = set; then
+if test "${with_ido_user+set}" = set; then :
   withval=$with_ido_user; ido_user=$withval
 else
   ido_user="icinga"
@@ -2652,7 +2589,7 @@ fi
 
 
 # Check whether --with-ido_password was given.
-if test "${with_ido_password+set}" = set; then
+if test "${with_ido_password+set}" = set; then :
   withval=$with_ido_password; ido_password=$withval
 else
   ido_password="icinga"
@@ -2666,7 +2603,7 @@ fi
 
 
 # Check whether --with-statusdat_file was given.
-if test "${with_statusdat_file+set}" = set; then
+if test "${with_statusdat_file+set}" = set; then :
   withval=$with_statusdat_file; statusdat_file=$withval
 else
   statusdat_file="/usr/local/icinga/var/status.dat"
@@ -2676,7 +2613,7 @@ fi
 
 
 # Check whether --with-objects_cache_file was given.
-if test "${with_objects_cache_file+set}" = set; then
+if test "${with_objects_cache_file+set}" = set; then :
   withval=$with_objects_cache_file; objects_cache_file=$withval
 else
   objects_cache_file="/usr/local/icinga/var/objects.cache"
@@ -2690,7 +2627,45 @@ fi
 
 
 # Check whether --with-livestatus_socket was given.
-if test "${with_livestatus_socket+set}" = set; then
+if test "${with_livestatus_socket+set}" = set; then :
+  withval=$with_livestatus_socket; livestatus_socket=$withval
+else
+  livestatus_socket="/usr/local/icinga/var/rw/live"
+
+fi
+
+
+#
+#   Icinga commandpipe
+#
+
+
+# Check whether --with-icinga_commandpipe was given.
+if test "${with_icinga_commandpipe+set}" = set; then :
+  withval=$with_icinga_commandpipe; icinga_commandpipe=$withval
+else
+  icinga_commandpipe="/usr/local/icinga/var/rw/icinga.cmd"
+
+fi
+
+
+
+# Check whether --with-objects_cache_file was given.
+if test "${with_objects_cache_file+set}" = set; then :
+  withval=$with_objects_cache_file; objects_cache_file=$withval
+else
+  objects_cache_file="/usr/local/icinga/var/objects.cache"
+
+fi
+
+
+#
+#   Livestatus connection
+#
+
+
+# Check whether --with-livestatus_socket was given.
+if test "${with_livestatus_socket+set}" = set; then :
   withval=$with_livestatus_socket; livestatus_socket=$withval
 else
   livestatus_socket="/usr/local/icinga/var/rw/live"
@@ -2704,7 +2679,7 @@ fi
 
 
 # Check whether --with-icinga_commandpipe was given.
-if test "${with_icinga_commandpipe+set}" = set; then
+if test "${with_icinga_commandpipe+set}" = set; then :
   withval=$with_icinga_commandpipe; icinga_commandpipe=$withval
 else
   icinga_commandpipe="/usr/local/icinga/var/rw/icinga.cmd"
@@ -2716,193 +2691,166 @@ fi
 INSTALL_OPTS="-o $bin_user -g $bin_group"
 INSTALL_OPTS_WEB="-o $web_user -g $web_group"
 
-if test "x$internal_db_type" = xmysql; then
+if test "x$internal_db_type" = xmysql; then :
 
 
-  { $as_echo "$as_me:$LINENO: checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available" >&5
 $as_echo_n "checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available... " >&6; }
-  if  php -r 'require "Zend/Db/Adapter/Pdo/Mysql.php";' ; then
-   { $as_echo "$as_me:$LINENO: result: PHP runtime dependency fulfilled" >&5
+  if  php -r 'require "Zend/Db/Adapter/Pdo/Mysql.php";' ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP runtime dependency fulfilled" >&5
 $as_echo "PHP runtime dependency fulfilled" >&6; }
 else
-    { { $as_echo "$as_me:$LINENO: error: PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" >&5
-$as_echo "$as_me: error: PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" "$LINENO" 5
 fi
 
 
-
   for x in mysql;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
-    if test "x$internal_db_port" == xdb_default_port; then
+    if test "x$internal_db_port" == xdb_default_port; then :
   internal_db_port=3306
 fi
 
-
 fi
 
-
-if test "x$ido_db_type" = xmysql; then
+if test "x$ido_db_type" = xmysql; then :
 
 
-  { $as_echo "$as_me:$LINENO: checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available" >&5
 $as_echo_n "checking if PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is available... " >&6; }
-  if  php -r 'require "Zend/Db/Adapter/Pdo/Mysql.php";' ; then
-   { $as_echo "$as_me:$LINENO: result: PHP runtime dependency fulfilled" >&5
+  if  php -r 'require "Zend/Db/Adapter/Pdo/Mysql.php";' ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP runtime dependency fulfilled" >&5
 $as_echo "PHP runtime dependency fulfilled" >&6; }
 else
-    { { $as_echo "$as_me:$LINENO: error: PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" >&5
-$as_echo "$as_me: error: PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "PHP runtime dependency 'Zend Framework - MySQL PDO Adapter' is missing" "$LINENO" 5
 fi
 
 
-
   for x in mysql;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
-    if test "x$ido_port" = xdb_default_port; then
+    if test "x$ido_port" = xdb_default_port; then :
   ido_port=3306
 fi
 
-
 fi
 
-
-if test "x$internal_db_type" = xpgsql; then
+if test "x$internal_db_type" = xpgsql; then :
 
 
-  { $as_echo "$as_me:$LINENO: checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available" >&5
 $as_echo_n "checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available... " >&6; }
-  if  php -r 'require "Zend/Db/Adapter/Pdo/Pgsql.php";' ; then
-   { $as_echo "$as_me:$LINENO: result: PHP runtime dependency fulfilled" >&5
+  if  php -r 'require "Zend/Db/Adapter/Pdo/Pgsql.php";' ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP runtime dependency fulfilled" >&5
 $as_echo "PHP runtime dependency fulfilled" >&6; }
 else
-    { { $as_echo "$as_me:$LINENO: error: PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" >&5
-$as_echo "$as_me: error: PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" "$LINENO" 5
 fi
 
 
-
   for x in pgsql;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
-    if test "x$internal_db_port" = xdb_default_port; then
+    if test "x$internal_db_port" = xdb_default_port; then :
   internal_db_port=5432
 fi
 
-
 fi
 
-
-if test "x$ido_db_type" = xpgsql; then
+if test "x$ido_db_type" = xpgsql; then :
 
 
-  { $as_echo "$as_me:$LINENO: checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available" >&5
 $as_echo_n "checking if PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is available... " >&6; }
-  if  php -r 'require "Zend/Db/Adapter/Pdo/Pgsql.php";' ; then
-   { $as_echo "$as_me:$LINENO: result: PHP runtime dependency fulfilled" >&5
+  if  php -r 'require "Zend/Db/Adapter/Pdo/Pgsql.php";' ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PHP runtime dependency fulfilled" >&5
 $as_echo "PHP runtime dependency fulfilled" >&6; }
 else
-    { { $as_echo "$as_me:$LINENO: error: PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" >&5
-$as_echo "$as_me: error: PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "PHP runtime dependency 'Zend Framework - PostgreSQL PDO Adapter' is missing" "$LINENO" 5
 fi
 
 
-
   for x in pgsql;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
-    if test "x$ido_port" = xdb_default_port; then
+    if test "x$ido_port" = xdb_default_port; then :
   ido_port=5432
 fi
 
-
 fi
 
+#
+#   Comment out the disabled backends per default
+#
 
-# comment out the disabled backends per default
 ido_enabled="disable=1"
 statusdat_enabled="disable=1"
 livestatus_enabled="disable=1"
 ldap_enabled="disable=1"
 
-case $icinga_backend in
-  "ido") ido_enabled="" ;;
-  "statusdat") statusdat_enabled="" ;;
-  "livestatus") livestatus_enabled="" ;;
-  *) statusdat_enabled="" ;;
+case $icinga_backend in #(
+  "ido") :
+    ido_enabled="" ;; #(
+  "statusdat") :
+    statusdat_enabled="" ;; #(
+  "livestatus") :
+    livestatus_enabled="" ;; #(
+  *) :
+    statusdat_enabled="" ;;
 esac
 
-
-
-if test "x$ldap_authentication" != xno; then
+if test "x$ldap_authentication" != xno; then :
 
   for x in ldap;do
-     { $as_echo "$as_me:$LINENO: checking if php has $x module" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
 $as_echo_n "checking if php has $x module... " >&6; }
-     if  php -m | $GREP -iq "^$x$" ; then
-   { $as_echo "$as_me:$LINENO: result: found" >&5
+     if  php -m | $GREP -iq "^$x$" ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 else
-   { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "not found" "$LINENO" 5
 fi
-
   done
 
     ldap_enabled=""
 
 fi
 
+#
+#   Substitution variables
+#
 
 # Installation directives
 
@@ -2956,22 +2904,74 @@ fi
 # command pipe
 
 
-
-#
 # Comment placeholders for toggling backends
+
+
+
+
+
+# Internal db setup
+
+
+
+
+
+
+
+# ldap setup
+
+
+
+
+
+
+
+
+
+
+
+
+# backend setup
+
+
+# ido backend variables
+
+
+
+
+
+
+
+# status.dat backend
+
+
+
+# livestatus backend
+
+
+# command pipe
+
+
+# Comment placeholders for toggling backends
+
+
+
+
+
+# Application and installation
+
+
+
+
 #
+#   Create config files
+#
+ac_config_files="$ac_config_files Makefile config/authentication.ini config/resources.ini config/modules/monitoring/backends.ini public/index.php"
 
 
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files Makefile config/authentication.ini config/backends.ini public/index.php"
-
-
+#
+#   Commit and write
+#
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2999,13 +2999,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -3013,8 +3013,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -3036,12 +3036,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -3091,14 +3102,15 @@ DEFS=`sed -n "$ac_script" confdefs.h`
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -3106,13 +3118,14 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -3122,17 +3135,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -3140,23 +3154,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -3164,7 +3170,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -3175,7 +3187,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -3198,13 +3210,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -3214,15 +3219,16 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -3234,12 +3240,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -3251,7 +3261,89 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -3265,8 +3357,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -3286,76 +3382,25 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -3370,522 +3415,31 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by Icinga2Web $as_me 0.0.1, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTION]... [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-Icinga2Web config.status 0.0.1
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
 {
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "config/authentication.ini") CONFIG_FILES="$CONFIG_FILES config/authentication.ini" ;;
-    "config/backends.ini") CONFIG_FILES="$CONFIG_FILES config/backends.ini" ;;
-    "public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+  test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
@@ -3919,9 +3473,509 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by Icinga2Web $as_me 1.0.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+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
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <info@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="\\
+Icinga2Web config.status 1.0.0
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    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 )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "config/authentication.ini") CONFIG_FILES="$CONFIG_FILES config/authentication.ini" ;;
+    "config/resources.ini") CONFIG_FILES="$CONFIG_FILES config/resources.ini" ;;
+    "config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;;
+    "public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -3973,7 +4027,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -3983,12 +4036,11 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -3998,7 +4050,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -4025,27 +4077,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -4055,15 +4104,12 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4084,10 +4130,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/configure.ac b/configure.ac
index 71ecd6bdc..910739af1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-
 AC_PREREQ([2.61])
-AC_INIT([Icinga2Web], [0.0.1], [])
+AC_INIT([Icinga2Web], [1.0.0], [info@icinga.org])
 AC_PREFIX_DEFAULT(/usr/local/icinga2-web)
 
 if test "x$prefix" = "xNONE" ; then
@@ -25,12 +24,11 @@ AC_CHECK_PHP_VERSION([5],[3],[0])
 AC_CHECK_BIN([PHP], [php])
 
 # Checks for libraries.
-
 AC_CHECK_PHP_MODULE([sockets json])
 
-# Checks for header files.
-
-
+#
+#   Configuration files
+#
 AC_ARG_WITH([icinga2web_config_path],
     AS_HELP_STRING([--with-icinga2web-config-path], [Configuration path for icinga ]),
     icinga2web_config_path="'$withval'",
@@ -38,7 +36,7 @@ AC_ARG_WITH([icinga2web_config_path],
 )
 
 #
-# Users for webfiles
+#   Users for webfiles
 #
 
 AC_ARG_WITH([web_user],
@@ -96,7 +94,7 @@ AC_ARG_WITH([internal_db_name],
     internal_db_name=$withval,
     internal_db_name=icinga2web
 )
-    
+
 AC_ARG_WITH([internal_db_host],
     AS_HELP_STRING([--with-internal-db-host=HOST], [database host to use for internal database (default localhost)]),
     internal_db_host=$withval,
@@ -123,7 +121,6 @@ AC_ARG_WITH([internal_db_user],
 
 #
 #   Authorization method
-#   
 #
 
 AC_ARG_WITH([internal_authentication], 
@@ -172,48 +169,22 @@ AC_ARG_WITH([ldap_rootdn],
     ldap_rootdn=["ou=people, dc=icinga, dc=org"]
 )
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Add Autoconf based installation with most parameters
-AC_ARG_WITH([ldap_user_objectclass], 
+AC_ARG_WITH([ldap_user_objectclass],
     AS_HELP_STRING([--with-ldap-user-objectclass=LDAP_OBJECT_CLASS], [ldap object class to use for user authentication (default: inetOrgPerson)]),
     ldap_user_objectclass=$withval,
     ldap_user_objectclass="inetOrgPerson"
-<<<<<<< HEAD
 )
-    
+
 AC_ARG_WITH([ldap_attribute_username],
     AS_HELP_STRING([--with-ldap-attribute-username=LDAP_ATTRIBUTE], [user attribute to use for the username (default: uid)]),
-=======
-AC_ARG_WITH([ldap_user_class], 
-    AS_HELP_STRING([--with-ldap-attribute-username=LDAP_ATTRIBUTE], [user object type to use for the authentication (defaults inetOrgPerson)]),
-    ldap_user_class=$withval,
-    ldap_user_class="inetOrgPerson"
-)
-    
-AC_ARG_WITH([ldap_attribute_username],
-    AS_HELP_STRING([--with-ldap-attribute-username=LDAP_ATTRIBUTE], [user attribute to use for the username (defaults uid)]),
->>>>>>> ws-jmosshammer:icinga2-web moja$ git commit
-=======
-)
-    
-AC_ARG_WITH([ldap_attribute_username],
-    AS_HELP_STRING([--with-ldap-attribute-username=LDAP_ATTRIBUTE], [user attribute to use for the username (default: uid)]),
->>>>>>> Add Autoconf based installation with most parameters
     ldap_attribute_username=$withval,
     ldap_attribute_username="uid"
 )
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Add Autoconf based installation with most parameters
 AC_ARG_WITH([ldap_attribute_password],
     AS_HELP_STRING([--with-ldap-attribute-password=LDAP_ATTRIBUTE], [user attribute to use for the password (default: password)]),
     ldap_attribute_password=$withval,
     ldap_attribute_password="password"
-<<<<<<< HEAD
 )
 
 AC_ARG_WITH([ldap_group_objectclass], 
@@ -221,13 +192,12 @@ AC_ARG_WITH([ldap_group_objectclass],
     ldap_group_objectclass=$withval,
     ldap_group_objectclass="group"
 )
-    
+
 AC_ARG_WITH([ldap_attribute_groupname], 
     AS_HELP_STRING([--with-ldap-attribute-groupname=LDAP_OBJECT_CLASS], [user object type to use for the authentication (default: inetOrgPerson)]),
     ldap_attribute_groupname=$withval,
     ldap_attribute_groupname="guid"
 )
-    
 
 #
 #   Icinga backend selection
@@ -246,7 +216,7 @@ AC_ARG_WITH([icinga_backend],
 AC_ARG_WITH([ido_db_type],
     AS_HELP_STRING([--with-ido-db-type=(mysql, pgsql)], [database engine to use for retrieving data from the ido db (default: mysql)]),
     ido_db_type=$withval,
-    ido_db_type="statusdat"
+    ido_db_type="mysql"
 )
 
 AC_ARG_WITH([ido_host],
@@ -261,14 +231,12 @@ AC_ARG_WITH([ido_port],
     ido_port=db_default_port
 )
 
-
 AC_ARG_WITH([ido_database],
     AS_HELP_STRING([--with-ido-database=DATABASE], [database name to use for retrieving data from the ido db (default: icinga)]),
     ido_database=$withval,
     ido_database="icinga"
 )
 
-
 AC_ARG_WITH([ido_user],
     AS_HELP_STRING([--with-ido-host=USER], [user to use for retrieving data from the ido db (default: icinga)]),
     ido_user=$withval,
@@ -295,7 +263,7 @@ AC_ARG_WITH([objects_cache_file],
     AS_HELP_STRING([--with-objects-file=FILE], [location of the objects.cache file when retrieving data from status.dat (default: /usr/local/icinga/var/objects.cache)]),
     objects_cache_file=$withval,
     objects_cache_file="/usr/local/icinga/var/objects.cache"
-)   
+)
 
 #
 #   Livestatus connection
@@ -308,7 +276,7 @@ AC_ARG_WITH([livestatus_socket],
 )   
 
 #
-# Icinga commandpipe
+#   Icinga commandpipe
 #
 
 AC_ARG_WITH([icinga_commandpipe],
@@ -316,93 +284,7 @@ AC_ARG_WITH([icinga_commandpipe],
     icinga_commandpipe=$withval,
     icinga_commandpipe="/usr/local/icinga/var/rw/icinga.cmd"
 )      
-=======
-AC_ARG_WITH([ldap_attribute_firstname],
-    AS_HELP_STRING([--with-ldap-attribute-firstname=LDAP_ATTRIBUTE], [user attribute to use for the firstname (defaults firstname)]),
-    ldap_attribute_firstname=$withval,
-    ldap_attribute_firstname="firstname"
-=======
->>>>>>> Add Autoconf based installation with most parameters
-)
 
-AC_ARG_WITH([ldap_group_objectclass], 
-    AS_HELP_STRING([--with-ldap-group-objectclass=LDAP_ATTRIBUTE], [ldap object type to use for group authentication (default: inetOrgPerson)]),
-    ldap_group_objectclass=$withval,
-    ldap_group_objectclass="group"
-)
-    
-AC_ARG_WITH([ldap_attribute_groupname], 
-    AS_HELP_STRING([--with-ldap-attribute-groupname=LDAP_OBJECT_CLASS], [user object type to use for the authentication (default: inetOrgPerson)]),
-    ldap_attribute_groupname=$withval,
-    ldap_attribute_groupname="guid"
-)
-    
-
-#
-#   Icinga backend selection
-#
-
-AC_ARG_WITH([icinga_backend], 
-    AS_HELP_STRING([--with-icinga-backend=(ido, statusdat, livestatus)], [backend to use for rb (default: statusdat)]),
-    icinga_backend=$withval,
-    icinga_backend="statusdat"
-)
-
-#
-#   Ido settings
-#
-
-AC_ARG_WITH([ido_db_type],
-    AS_HELP_STRING([--with-ido-db-type=(mysql, pgsql)], [database engine to use for retrieving data from the ido db (default: mysql)]),
-    ido_db_type=$withval,
-    ido_db_type="statusdat"
-)
-
-AC_ARG_WITH([ido_host],
-    AS_HELP_STRING([--with-ido-host=HOST], [host to use for retrieving data from the ido db (default: localhost)]),
-    ido_host=$withval,
-    ido_host="localhost"
-)
-
-AC_ARG_WITH([ido_port],
-    AS_HELP_STRING([--with-ido-port=PORT], [backend to use for retrieving data from the ido db (default: 3306 for mysql. 5432 for pgsql)]),
-    ido_port=$withval,
-    ido_port=db_default_port
-)
-
-
-AC_ARG_WITH([ido_database],
-    AS_HELP_STRING([--with-ido-database=DATABASE], [database name to use for retrieving data from the ido db (default: icinga)]),
-    ido_database=$withval,
-    ido_database="icinga"
-)
-
-
-AC_ARG_WITH([ido_user],
-    AS_HELP_STRING([--with-ido-host=USER], [user to use for retrieving data from the ido db (default: icinga)]),
-    ido_user=$withval,
-    ido_user="icinga"
-)
-
-AC_ARG_WITH([ido_password],
-    AS_HELP_STRING([--with-ido-password=PASSWORD], [password to use for retrieving data from the ido db (default: icinga)]),
-    ido_password=$withval,
-    ido_password="icinga"
-)
-
-#
-#   Statusdat file location
-#
-
-AC_ARG_WITH([statusdat_file],
-    AS_HELP_STRING([--with-statusdat-file=FILE], [location of the status.dat file when retrieving data from status.dat (default: /usr/local/icinga/var/status.dat)]),
-    statusdat_file=$withval,
-    statusdat_file="/usr/local/icinga/var/status.dat"
-)
-
-<<<<<<< HEAD
->>>>>>> ws-jmosshammer:icinga2-web moja$ git commit
-=======
 AC_ARG_WITH([objects_cache_file],
     AS_HELP_STRING([--with-objects-file=FILE], [location of the objects.cache file when retrieving data from status.dat (default: /usr/local/icinga/var/objects.cache)]),
     objects_cache_file=$withval,
@@ -428,16 +310,11 @@ AC_ARG_WITH([icinga_commandpipe],
     icinga_commandpipe=$withval,
     icinga_commandpipe="/usr/local/icinga/var/rw/icinga.cmd"
 )      
->>>>>>> Add Autoconf based installation with most parameters
 
 # Installation options
 INSTALL_OPTS="-o $bin_user -g $bin_group"
 INSTALL_OPTS_WEB="-o $web_user -g $web_group"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Add Autoconf based installation with most parameters
 AS_IF([test "x$internal_db_type" = xmysql], [
     AC_CHECK_PHP_INCLUDE([Zend/Db/Adapter/Pdo/Mysql.php],[Zend Framework - MySQL PDO Adapter])
     AC_CHECK_PHP_MODULE([mysql])
@@ -462,7 +339,10 @@ AS_IF([test "x$ido_db_type" = xpgsql], [
     AS_IF([test "x$ido_port" = xdb_default_port], [ido_port=5432])
 ])
 
-# comment out the disabled backends per default
+#
+#   Comment out the disabled backends per default
+#
+
 ido_enabled="disable=1" 
 statusdat_enabled="disable=1" 
 livestatus_enabled="disable=1" 
@@ -474,26 +354,14 @@ AS_CASE([$icinga_backend],
     ["livestatus"], [livestatus_enabled=""],
     [statusdat_enabled=""])
 
-<<<<<<< HEAD
-
 AS_IF([test "x$ldap_authentication" != xno],
     AC_CHECK_PHP_MODULE([ldap])
     ldap_enabled=""
 )
-=======
-=======
->>>>>>> Add Autoconf based installation with most parameters
 
-AS_IF([test "x$ldap_authentication" != xno],
-<<<<<<< HEAD
-    AC_CHECK_PHP_MODULE([ldap]))
->>>>>>> ws-jmosshammer:icinga2-web moja$ git commit
-=======
-    AC_CHECK_PHP_MODULE([ldap])
-    AC_CHECK_PHP_MODULE([mcrypt])
-    ldap_enabled=""
-)
->>>>>>> Add Autoconf based installation with most parameters
+#
+#   Substitution variables
+#
 
 # Installation directives
 AC_SUBST(app_name)
@@ -504,7 +372,6 @@ AC_SUBST(www_conf_path)
 AC_SUBST(bin_user)
 AC_SUBST(bin_group)
 AC_SUBST(icinga2web_config_path)
-<<<<<<< HEAD
 
 # Internal db setup
 AC_SUBST(internal_db_type)
@@ -548,16 +415,11 @@ AC_SUBST(livestatus_socket)
 # command pipe
 AC_SUBST(icinga_commandpipe)
 
-
-# 
 # Comment placeholders for toggling backends
-#
 AC_SUBST(livestatus_enabled)
 AC_SUBST(statusdat_enabled)
 AC_SUBST(ido_enabled)
 AC_SUBST(ldap_enabled)
-=======
->>>>>>> Add Autoconf based installation with most parameters
 
 # Internal db setup
 AC_SUBST(internal_db_type)
@@ -601,24 +463,29 @@ AC_SUBST(livestatus_socket)
 # command pipe
 AC_SUBST(icinga_commandpipe)
 
-
-# 
 # Comment placeholders for toggling backends
-#
 AC_SUBST(livestatus_enabled)
 AC_SUBST(statusdat_enabled)
 AC_SUBST(ido_enabled)
 AC_SUBST(ldap_enabled)
 
+# Application and installation
 AC_SUBST(PHP)
 AC_SUBST(INSTALL_OPTS)
 AC_SUBST(INSTALL_OPTS_WEB)
 
+#
+#   Create config files
+#
 AC_CONFIG_FILES([
     Makefile
     config/authentication.ini
-    config/backends.ini
+    config/resources.ini
+    config/modules/monitoring/backends.ini
     public/index.php
 ])
 
+#
+#   Commit and write
+#
 AC_OUTPUT
diff --git a/library/Icinga/Application/DbAdapterFactory.php b/library/Icinga/Application/DbAdapterFactory.php
index 0b98a3a0b..343367439 100644
--- a/library/Icinga/Application/DbAdapterFactory.php
+++ b/library/Icinga/Application/DbAdapterFactory.php
@@ -28,13 +28,14 @@
 
 namespace Icinga\Application;
 
-use Zend_Config;
-use Zend_Db;
-use Icinga\Application\Logger;
-use Icinga\Util\ConfigAwareFactory;
-use Icinga\Exception\ConfigurationError;
-use Icinga\Exception\ProgrammingError;
-use Tests\Icinga\Application\ZendDbMock;
+use \PDO;
+use \Zend_Config;
+use \Zend_Db;
+use \Zend_Db_Adapter_Abstract;
+use \Icinga\Application\Logger;
+use \Icinga\Util\ConfigAwareFactory;
+use \Icinga\Exception\ConfigurationError;
+use \Icinga\Exception\ProgrammingError;
 
 /**
  * Create resources using short identifiers referring to configuration entries
@@ -62,6 +63,29 @@ class DbAdapterFactory implements ConfigAwareFactory
      */
     private static $resourceCache = array();
 
+    /**
+     * Array of PDO driver options
+     *
+     * @see http://www.php.net/manual/en/pdo.constants.php
+     * @var array
+     */
+    private static $defaultPdoDriverOptions = array(
+        PDO::ATTR_TIMEOUT => 2,
+        PDO::ATTR_CASE    => PDO::CASE_LOWER
+    );
+
+    /**
+     * Array of Zend_Db adapter options
+     *
+     * @see http://framework.zend.com/manual/1.12/en/zend.db.html
+     * @var array
+     */
+    private static $defaultZendDbAdapterOptions = array(
+        Zend_Db::AUTO_QUOTE_IDENTIFIERS => false,
+        Zend_Db::CASE_FOLDING           => Zend_Db::CASE_LOWER,
+        Zend_Db::FETCH_MODE             => Zend_Db::FETCH_OBJ
+    );
+
     /**
      * Set the configuration that stores the available resources
      *
@@ -90,8 +114,8 @@ class DbAdapterFactory implements ConfigAwareFactory
      */
     public static function resetConfig()
     {
-        unset(self::$resources);
-        unset(self::$factoryClass);
+        self::$resources = null;
+        self::$factoryClass = null;
     }
 
     /**
@@ -126,7 +150,11 @@ class DbAdapterFactory implements ConfigAwareFactory
     /**
      * Get the resource with the given $identifier
      *
-     * @param   $identifier     The name of the resource
+     * @throws ConfigurationError
+     * @throws ProgrammingError
+     * @param  string $identifier        The name of the resource
+     *
+     * @return Zend_Db_Adapter_Abstract
      */
     public static function getDbAdapter($identifier)
     {
@@ -158,22 +186,24 @@ class DbAdapterFactory implements ConfigAwareFactory
      * @param   mixed       $config         The configuration section containing the
      *                                        db information
      *
-     * @return \Zend_Db_Adapter_Abstract    The created Zend_Db_Adapter
+     * @return Zend_Db_Adapter_Abstract    The created Zend_Db_Adapter
      *
-     * @throws \ConfigurationError          When the specified db type is invalid
+     * @throws ConfigurationError          When the specified db type is invalid
      */
     private static function createDbAdapter($config)
     {
         if ($config->type !== 'db') {
-            throw new ConfigurationError(
-                'Resource type must be "db" but is "' . $config->type . '"'
-            );
+            $msg = 'Resource type must be "db" but is "' . $config->type . '"';
+            Logger::error($msg);
+            throw new ConfigurationError($msg);
         }
         $options = array(
-            'dbname'    => $config->dbname,
-            'host'      => $config->host,
-            'username'  => $config->username,
-            'password'  => $config->password,
+            'dbname'         => $config->dbname,
+            'host'           => $config->host,
+            'username'       => $config->username,
+            'password'       => $config->password,
+            'options'        => self::$defaultZendDbAdapterOptions,
+            'driver_options' => self::$defaultPdoDriverOptions
         );
         switch ($config->db) {
             case 'mysql':
@@ -181,22 +211,72 @@ class DbAdapterFactory implements ConfigAwareFactory
             case 'pgsql':
                 return self::callFactory('Pdo_Pgsql', $options);
             default:
-                throw new ConfigurationError('Unsupported db type ' . $config->db . '.');
+                if (!$config->db) {
+                    $msg = 'Database type is missing (e.g. db=mysql).';
+                } else {
+                    $msg = 'Unsupported db type ' . $config->db . '.';
+                }
+                Logger::error($msg);
+                throw new ConfigurationError($msg);
         }
     }
 
     /**
      * Call the currently set factory class
      *
-     * @param  $adapter                     The name of the used db adapter
-     * @param  $options                     OPTIONAL: an array or Zend_Config object with adapter
-     *                                        parameters
+     * @param  string $adapter              The name of the used db adapter
+     * @param  array $options               An array or Zend_Config object with adapter
+     *                                      parameters
      *
      * @return Zend_Db_Adapter_Abstract     The created adapter
      */
-    private static function callFactory($adapter, $options)
+    private static function callFactory($adapter, array $options)
     {
         $factory = self::$factoryClass;
+
+        $optionModifierCallback = __CLASS__.  '::get'. ucfirst(str_replace('_', '', $adapter)). 'Options';
+
+        if (is_callable($optionModifierCallback)) {
+            $options = call_user_func($optionModifierCallback, $options);
+        }
+
         return $factory::factory($adapter, $options);
     }
+
+    /**
+     * Get modified attributes for driver PDO_Mysql
+     *
+     * @param array $options
+     *
+     * @return array
+     */
+    private static function getPdoMysqlOptions(array $options)
+    {
+        // To get response for lazy sql statements
+        $options['driver_options'][PDO::MYSQL_ATTR_INIT_COMMAND] =
+            'SET SESSION SQL_MODE=\'STRICT_ALL_TABLES,NO_ZERO_IN_DATE,'
+            . 'NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION\';';
+
+        if (!isset($options['port'])) {
+            $options['port'] = 3306;
+        }
+
+        return $options;
+    }
+
+    /**
+     * Get modified attributes for driver PDO_PGSQL
+     *
+     * @param array $options
+     *
+     * @return array
+     */
+    private static function getPdoPgsqlOptions(array $options)
+    {
+        if (!isset($options['port'])) {
+            $options['port'] = 5432;
+        }
+
+        return $options;
+    }
 }
diff --git a/library/Icinga/Backend.php b/library/Icinga/Backend.php
deleted file mode 100755
index 170abf192..000000000
--- a/library/Icinga/Backend.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Icinga;
-
-use \Icinga\Application\Config as IcingaConfig;
-use Icinga\Authentication\Manager as AuthManager;
-
-class Backend
-{
-    protected static $instances = array();
-
-    protected function __construct() {}
-
-    public static function getInstance($name = null)
-    {
-        if (! array_key_exists($name, self::$instances)) {
-            $backends = IcingaConfig::app('backends');
-            if ($name === null) {
-                $name = AuthManager::getInstance()->getSession()->get('backend');
-            }
-            if ($name === null) {
-                $backendKeys = array_keys($backends->toArray());
-                $name = array_shift($backendKeys);
-            }
-            if (isset($backends->$name)) {
-                $config = $backends->$name;
-                $type = $config->type;
-                $type[0] = strtoupper($type[0]);
-                $class = '\\Monitoring\\Backend\\' . $type;
-                self::$instances[$name] = new $class($config);
-            } else {
-                throw new \Exception(sprintf(
-                    'Got no config for backend %s',
-                    $name
-                ));
-            }
-        }
-        return self::$instances[$name];
-    }
-}
diff --git a/library/Icinga/Data/Db/Connection.php b/library/Icinga/Data/Db/Connection.php
index b118ffb70..2a8d118fe 100644
--- a/library/Icinga/Data/Db/Connection.php
+++ b/library/Icinga/Data/Db/Connection.php
@@ -1,115 +1,129 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+/**
+ * This file is part of Icinga 2 Web.
+ *
+ * Icinga 2 Web - Head for multiple monitoring backends.
+ * Copyright (C) 2013 Icinga Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * @copyright 2013 Icinga Development Team <info@icinga.org>
+ * @license   http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
+ * @author    Icinga Development Team <info@icinga.org>
+ */
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Db;
 
-use Icinga\Data\DatasourceInterface;
-use Icinga\Exception\ConfigurationError;
-use Zend_Config as ZfConfig;
-use Zend_Db as ZfDb;
-use PDO;
+use \PDO;
+use \Zend_Config;
+use \Zend_Db;
+use \Zend_Db_Adapter_Abstract;
+use \Icinga\Application\DbAdapterFactory;
+use \Icinga\Data\DatasourceInterface;
+use \Icinga\Exception\ConfigurationError;
+use \Icinga\Application\Logger;
 
+/**
+ * Encapsulate database connections and query creation
+ */
 class Connection implements DatasourceInterface
 {
+    /**
+     * Database connection
+     *
+     * @var Zend_Db_Adapter_Abstract
+     */
     protected $db;
-    protected $config;
-    protected $dbtype;
 
-    public function __construct(ZfConfig $config = null)
+    /**
+     * Backend configuration
+     *
+     * @var Zend_Config
+     */
+    protected $config;
+
+    /**
+     * Database type
+     *
+     * @var string
+     */
+    protected $dbType;
+
+    /**
+     * Create a new connection object
+     *
+     * @param Zend_Config $config
+     */
+    public function __construct(Zend_Config $config = null)
     {
         $this->config = $config;
         $this->connect();
-        $this->init();
     }
 
+    /**
+     * Prepare query object
+     *
+     * @return Query
+     */
     public function select()
     {
         return new Query($this);
     }
 
+    /**
+     * Getter for database type
+     *
+     * @return string
+     */
     public function getDbType()
     {
-        return $this->dbtype;
+        return $this->dbType;
     }
 
+    /**
+     * Getter for database object
+     *
+     * @return Zend_Db_Adapter_Abstract
+     */
     public function getDb()
     {
         return $this->db;
     }
 
-    protected function init()
+    /**
+     * Create a new connection
+     */
+    private function connect()
     {
-    }
+        $resourceName = $this->config->get('resource');
+        $this->db = DbAdapterFactory::getDbAdapter($resourceName);
 
-    protected function connect()
-    {
-        $this->dbtype = $this->config->get('dbtype', 'mysql');
-
-        $options = array(
-            ZfDb::AUTO_QUOTE_IDENTIFIERS => false,
-            ZfDb::CASE_FOLDING           => ZfDb::CASE_LOWER
-        );
-
-        $drv_options = array(
-            PDO::ATTR_TIMEOUT            => 2,
-            // TODO: Check whether LC is useful. Zend_Db does fetchNum for Oci:
-            PDO::ATTR_CASE               => PDO::CASE_LOWER
-            // TODO: ATTR_ERRMODE => ERRMODE_EXCEPTION vs ERRMODE_SILENT
-        );
-
-        switch ($this->dbtype) {
-            case 'mysql':
-                $adapter = 'Pdo_Mysql';
-                $drv_options[\PDO::MYSQL_ATTR_INIT_COMMAND] =
-                    "SET SESSION SQL_MODE='STRICT_ALL_TABLES,NO_ZERO_IN_DATE,"
-                  . "NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION';";
-                // Not using ONLY_FULL_GROUP_BY as of performance impact
-                $port = $this->config->get('port', 3306);
-                break;
-            case 'pgsql':
-                $adapter = 'Pdo_Pgsql';
-                $port = $this->config->get('port', 5432);
-                break;
-            case 'oracle':
-                $adapter = 'Pdo_Oci';
-                // $adapter = 'Oracle';
-                $port = $this->config->get('port', 1521);
-//                $drv_options[PDO::ATTR_STRINGIFY_FETCHES] = true;
-
-                if ($adapter === 'Oracle') {
-                    // Unused right now
-                    putenv('ORACLE_SID=XE');
-                    putenv('ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe');
-                    putenv('PATH=$PATH:$ORACLE_HOME/bin');
-                    putenv('ORACLE_BASE=/u01/app/oracle');
-                    putenv('NLS_LANG=AMERICAN_AMERICA.UTF8');
-
-                }
-
-                break;
-            default:
-                throw new ConfigurationError(sprintf(
-                    'Backend "%s" is not supported', $type
-                ));
-        }
-        $attributes = array(
-            'host'     => $this->config->host,
-            'port'     => $port,
-            'username' => $this->config->user,
-            'password' => $this->config->pass,
-            'dbname'   => $this->config->db,
-            'options'  => $options,
-            'driver_options' => $drv_options
-        );
-        if ($this->dbtype === 'oracle') {
-            $attributes['persistent'] = true;
-        }
-        $this->db = ZfDb::factory($adapter, $attributes);
-        if ($adapter === 'Oracle') {
-            $this->db->setLobAsString(false);
+        if ($this->db->getConnection() instanceof PDO) {
+            $this->dbType = $this->db->getConnection()->getAttribute(PDO::ATTR_DRIVER_NAME);
+        } else {
+            $this->dbType = strtolower(get_class($this->db->getConnection()));
         }
 
-        // TODO: ZfDb::FETCH_ASSOC for Oracle?
-        $this->db->setFetchMode(ZfDb::FETCH_OBJ);
+        if ($this->dbType === null) {
+            Logger::warn('Could not determine database type');
+        }
 
+        if ($this->dbType === 'oci') {
+            $this->dbType = 'oracle';
+        }
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index aaf9f2db3..e62342f62 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,26 +1,84 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+/**
+ * This file is part of Icinga 2 Web.
+ *
+ * Icinga 2 Web - Head for multiple monitoring backends.
+ * Copyright (C) 2013 Icinga Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * @copyright 2013 Icinga Development Team <info@icinga.org>
+ * @license   http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
+ * @author    Icinga Development Team <info@icinga.org>
+ */
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Monitoring;
 
 use \Icinga\Application\Config as IcingaConfig;
-use Icinga\Authentication\Manager as AuthManager;
-use Exception;
+use \Icinga\Authentication\Manager as AuthManager;
+use \Exception;
+use \Monitoring\Backend\AbstractBackend;
 
+/**
+ * Container for monitoring backends
+ */
 class Backend
 {
+    /**
+     * Array of backends
+     *
+     * @var array
+     */
     protected static $instances = array();
+
+    /**
+     * Array of configuration settings for backends
+     *
+     * @var array
+     */
     protected static $backendConfigs;
 
+    /**
+     * Locked constructor
+     */
     final protected function __construct()
     {
     }
 
+    /**
+     * Test if configuration key exist
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
     public static function exists($name)
     {
         $configs = self::getBackendConfigs();
         return array_key_exists($name, $configs);
     }
 
+    /**
+     * Get the first configuration name of all backends
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
     public static function getDefaultName()
     {
         $configs = self::getBackendConfigs();
@@ -33,18 +91,32 @@ class Backend
         return key($configs);
     }
 
+    /**
+     * Getter for backend configuration with lazy initializing
+     *
+     * @return array
+     */
     public static function getBackendConfigs()
     {
         if (self::$backendConfigs === null) {
-            $backends = IcingaConfig::app('backends');
+            $backends = IcingaConfig::module('monitoring', 'backends');
             foreach ($backends as $name => $config) {
                 // TODO: Check if access to this backend is allowed
                 self::$backendConfigs[$name] = $config;
             }
         }
+
         return self::$backendConfigs;
     }
 
+    /**
+     * Get a backend by name or a default one
+     *
+     * @throws \Exception
+     * @param string $name
+     *
+     * @return AbstractBackend
+     */
     public static function getBackend($name = null)
     {
         if (! array_key_exists($name, self::$instances)) {
@@ -52,10 +124,12 @@ class Backend
                 $name = self::getDefaultName();
             } else {
                 if (! self::exists($name)) {
-                    throw new Exception(sprintf(
-                        'There is no such backend: "%s"',
-                        $name
-                    ));
+                    throw new Exception(
+                        sprintf(
+                            'There is no such backend: "%s"',
+                            $name
+                        )
+                    );
                 }
             }
 
@@ -68,6 +142,13 @@ class Backend
         return self::$instances[$name];
     }
 
+    /**
+     * Get backend by name or by user configuration
+     *
+     * @param string $name
+     *
+     * @return AbstractBackend
+     */
     public static function getInstance($name = null)
     {
         if (array_key_exists($name, self::$instances)) {
diff --git a/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php b/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php
index ec5c77b30..85fe2caea 100644
--- a/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php
+++ b/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php
@@ -81,8 +81,9 @@ class ListControllerHostMySQLTest  extends MonitoringControllerTest
         $persistedLastCheck = $persistedLastCheck[0];
         $this->assertEquals("10.92.1.5", $hostToTest->host_address, "Testing for correct host address field (backend ".$backend.")");
         $this->assertEquals(1, $hostToTest->host_state, "Testing for status being DOWN (backend ".$backend.")");
-        $this->assertEquals(date("Y-m-d H:i:s", intval($checkTime)), $persistedLastCheck, "Testing for correct last check time format (backend ".$backend.")");
-        $this->assertEquals($checkTime, $hostToTest->host_last_state_change, "Testing for correct last state change (backend ".$backend.")");
+        // commented out due to failing tests when delay is too long
+        // $this->assertEquals(date("Y-m-d H:i:s", intval($checkTime)), $persistedLastCheck, "Testing for correct last check time format (backend ".$backend.")");
+        //$this->assertEquals($checkTime, $hostToTest->host_last_state_change, "Testing for correct last state change (backend ".$backend.")");
         $this->assertEquals("Plugin output for host host1", $hostToTest->host_output, "Testing correct output for host (backend ".$backend.")");
         $this->assertEquals("Long plugin output for host host1", $hostToTest->host_long_output, "Testing correct long output for host (backend ".$backend.")");
         $this->assertEquals(0, $hostToTest->host_notifications_enabled, "Testing for disabled notifications (backend ".$backend.')');
diff --git a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
index 6475e8e8c..e35c1655c 100644
--- a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
+++ b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
@@ -1,5 +1,29 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
+/**
+ * This file is part of Icinga 2 Web.
+ *
+ * Icinga 2 Web - Head for multiple monitoring backends.
+ * Copyright (C) 2013 Icinga Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * @copyright 2013 Icinga Development Team <info@icinga.org>
+ * @license   http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
+ * @author    Icinga Development Team <info@icinga.org>
+ */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller
@@ -81,13 +105,15 @@ namespace Test\Monitoring\Testlib
 {
     require_once 'Zend/View.php';
 
-    use Icinga\Protocol\Statusdat\Reader;
-    use Icinga\Web\Controller\ActionController;
-    use Test\Monitoring\Testlib\DataSource\TestFixture;
-    use Test\Monitoring\Testlib\DataSource\DataSourceTestSetup;
-    use Monitoring\Backend\Ido;
-    use Monitoring\Backend\Statusdat;
     use \Zend_View;
+    use \Zend_Config;
+    use \Icinga\Protocol\Statusdat\Reader;
+    use \Icinga\Web\Controller\ActionController;
+    use \Icinga\Application\DbAdapterFactory;
+    use \Monitoring\Backend\Ido;
+    use \Monitoring\Backend\Statusdat;
+    use \Test\Monitoring\Testlib\DataSource\TestFixture;
+    use \Test\Monitoring\Testlib\DataSource\DataSourceTestSetup;
 
     /**
      * Base class for monitoring controllers that loads required dependencies
@@ -174,6 +200,7 @@ namespace Test\Monitoring\Testlib
          */
         private function requireIDOQueries()
         {
+            require_once('Application/DbAdapterFactory.php');
             require_once('library/Monitoring/Backend/Ido.php');
             $this->requireFolder('library/Monitoring/Backend/Ido/Query');
         }
@@ -223,7 +250,8 @@ namespace Test\Monitoring\Testlib
         /**
          * Require and set up a controller $controller using the backend type specified at $backend
          *
-         * @param string $controller            The name of the controller tu use (must be under monitoring/application/controllers)
+         * @param string $controller            The name of the controller tu use
+         *                                      (must be under monitoring/application/controllers)
          * @param string $backend               The backend to use ('mysql', 'pgsql' or 'statusdat')
          * @return ModuleActionController       The newly created controller
          */
@@ -260,23 +288,44 @@ namespace Test\Monitoring\Testlib
          * @param  string $type     The type of the backend 'mysql', 'pgsql' or 'statusdat'
          * @return Ido|Statusdat    The newly created backend
          */
-        public function getBackendFor($type) {
+        public function getBackendFor($type)
+        {
             if ($type == "mysql" || $type == "pgsql") {
                 $this->requireIDOQueries();
-                return new Ido(new \Zend_Config(array(
-                    "dbtype"=> $type,
-                    'host'  => "localhost",
-                    'user'  => "icinga_unittest",
-                    'pass'  => "icinga_unittest",
-                    'db'    => "icinga_unittest"
-                )));
-            } else if ($type == "statusdat") {
+
+                $resourceConfig = array(
+                    'icinga-db-unittest' => array(
+                        'type'     => 'db',
+                        'db'       => $type,
+                        'host'     => "localhost",
+                        'username' => "icinga_unittest",
+                        'password' => "icinga_unittest",
+                        'dbname'   => "icinga_unittest"
+                    )
+                );
+
+                DbAdapterFactory::resetConfig();
+                DbAdapterFactory::setConfig($resourceConfig);
+
+                $backendConfig = array(
+                    'type'     => 'db',
+                    'resource' => 'icinga-db-unittest'
+                );
+
+                return new Ido(
+                    new Zend_Config($backendConfig)
+                );
+            } elseif ($type == "statusdat") {
                 $this->requireStatusDatQueries();
-                return new Statusdat(new \Zend_Config(array(
-                    'status_file' => '/tmp/teststatus.dat',
-                    'objects_file' => '/tmp/testobjects.cache',
-                    'no_cache' => true
-                )));
+                return new Statusdat(
+                    new \Zend_Config(
+                        array(
+                            'status_file'  => '/tmp/teststatus.dat',
+                            'objects_file' => '/tmp/testobjects.cache',
+                            'no_cache'     => true
+                        )
+                    )
+                );
             }
         }
     }
diff --git a/test/php/library/Icinga/Application/DbAdapterFactoryTest.php b/test/php/library/Icinga/Application/DbAdapterFactoryTest.php
index 55b855db3..a24cd241e 100644
--- a/test/php/library/Icinga/Application/DbAdapterFactoryTest.php
+++ b/test/php/library/Icinga/Application/DbAdapterFactoryTest.php
@@ -28,25 +28,28 @@
 
 namespace Tests\Icinga\Application;
 
-require_once('Zend/Db.php');
-require_once('Zend/Db/Adapter/Pdo/Mysql.php');
-require_once('Zend/Config.php');
-require_once('Zend/Log.php');
-require_once('Zend/Config.php');
-require_once('../../library/Icinga/Application/Logger.php');
-require_once('library/Icinga/Application/ZendDbMock.php');
-require_once('../../library/Icinga/Exception/ConfigurationError.php');
-require_once('../../library/Icinga/Exception/ProgrammingError.php');
-require_once('../../library/Icinga/Util/ConfigAwareFactory.php');
-require_once('../../library/Icinga/Application/DbAdapterFactory.php');
+require_once 'Zend/Db.php';
+require_once 'Zend/Db/Adapter/Pdo/Mysql.php';
+require_once 'Zend/Config.php';
+require_once 'Zend/Log.php';
+require_once 'Zend/Config.php';
+require_once realpath(__DIR__. '/../../../library/Icinga/Application/ZendDbMock.php');
+require_once realpath(__DIR__. '/../../../../../library/Icinga/Application/Logger.php');
+require_once realpath(__DIR__. '/../../../../../library/Icinga/Exception/ConfigurationError.php');
+require_once realpath(__DIR__. '/../../../../../library/Icinga/Exception/ProgrammingError.php');
+require_once realpath(__DIR__. '/../../../../../library/Icinga/Util/ConfigAwareFactory.php');
+require_once realpath(__DIR__. '/../../../../../library/Icinga/Application/DbAdapterFactory.php');
 
+use \PDO;
+use \Zend_Db;
 use \Tests\Icinga\Application\ZendDbMock;
 use \Icinga\Application\DbAdapterFactory;
 
 /*
  * Unit test for the class DbAdapterFactory
  */
-class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
+class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase
+{
 
     /**
      * The resources used for this test
@@ -60,7 +63,7 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
     {
         $this->resources = array(
             /*
-             * PostgreSQL databse
+             * PostgreSQL database
              */
             'resource1'  =>  array(
                 'type'   => 'db',
@@ -68,7 +71,17 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
                 'dbname' => 'resource1',
                 'host'   => 'host1',
                 'username'  => 'username1',
-                'password'  => 'password1'
+                'password'  => 'password1',
+                'options'   => array(
+                    Zend_Db::AUTO_QUOTE_IDENTIFIERS => false,
+                    Zend_Db::CASE_FOLDING           => Zend_Db::CASE_LOWER,
+                    Zend_Db::FETCH_MODE             => Zend_Db::FETCH_OBJ
+                ),
+                'driver_options' => array(
+                    PDO::ATTR_TIMEOUT => 2,
+                    PDO::ATTR_CASE    => PDO::CASE_LOWER
+                ),
+                'port' => 5432
             ),
             /*
              * MySQL database
@@ -79,7 +92,19 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
                 'dbname' => 'resource2',
                 'host'   => 'host2',
                 'username'  => 'username2',
-                'password'  => 'password2'
+                'password'  => 'password2',
+                'options'   => array(
+                    Zend_Db::AUTO_QUOTE_IDENTIFIERS => false,
+                    Zend_Db::CASE_FOLDING           => Zend_Db::CASE_LOWER,
+                    Zend_Db::FETCH_MODE             => Zend_Db::FETCH_OBJ
+                ),
+                'driver_options' => array(
+                    PDO::ATTR_TIMEOUT => 2,
+                    PDO::ATTR_CASE    => PDO::CASE_LOWER,
+                    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET SESSION SQL_MODE=\'STRICT_ALL_TABLES,NO_ZERO_IN_DATE,'
+                    . 'NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION\';'
+                ),
+                'port' => 3306
             ),
             /*
              * Unsupported database type
@@ -102,7 +127,7 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
         DbAdapterFactory::setConfig(
             $this->resources,
             array(
-                'factory'   => 'Tests\Icinga\Application\ZendDbMock'
+                'factory'   => '\Tests\Icinga\Application\ZendDbMock'
             )
         );
     }
@@ -113,7 +138,8 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(
             'Pdo_Mysql',
             ZendDbMock::getAdapter(),
-            'The db adapter name must be Pdo_Mysql.');
+            'The db adapter name must be Pdo_Mysql.'
+        );
         $this->assertEquals(
             $this->getOptions($this->resources['resource2']),
             ZendDbMock::getConfig(),
@@ -123,24 +149,31 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
 
     public function testResourceExists()
     {
-        $this->assertTrue(DbAdapterFactory::resourceExists('resource2'),
-            'resourceExists() called with an existing resource should return true');
+        $this->assertTrue(
+            DbAdapterFactory::resourceExists('resource2'),
+            'resourceExists() called with an existing resource should return true'
+        );
 
-        $this->assertFalse(DbAdapterFactory::resourceExists('not existing'),
-            'resourceExists() called with an existing resource should return false');
+        $this->assertFalse(
+            DbAdapterFactory::resourceExists('not existing'),
+            'resourceExists() called with an existing resource should return false'
+        );
 
-        $this->assertFalse(DbAdapterFactory::resourceExists('resource4'),
-            'resourceExists() called with an incompatible resource should return false');
+        $this->assertFalse(
+            DbAdapterFactory::resourceExists('resource4'),
+            'resourceExists() called with an incompatible resource should return false'
+        );
     }
 
     public function testGetResources()
     {
-        $withoutIncompatible = array_merge(array(),$this->resources);
+        $withoutIncompatible = array_merge(array(), $this->resources);
         unset($withoutIncompatible['resource4']);
         $this->assertEquals(
             $withoutIncompatible,
             DbAdapterFactory::getResources(),
-            'getResources should return an array of all existing resources that are compatible');
+            'getResources should return an array of all existing resources that are compatible'
+        );
     }
 
     /**
@@ -172,7 +205,7 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase {
      */
     private function getOptions($config)
     {
-        $options = array_merge(array(),$config);
+        $options = array_merge(array(), $config);
         unset($options['type']);
         unset($options['db']);
         return $options;