[icinga-checkins] icinga.org: icinga-core/r1.5: configure: s/HTTP_CONF/HTTPD_CONF/ and AC_CHECK_HEADERS(ocilib.h) #1837 #1842

git at icinga.org git at icinga.org
Wed Aug 24 16:00:35 CEST 2011


Module: icinga-core
Branch: r1.5
Commit: 9f5a5ec7069eef63aab00d477eb16b0b13d48664
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9f5a5ec7069eef63aab00d477eb16b0b13d48664

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Aug 24 15:57:57 2011 +0200

configure: s/HTTP_CONF/HTTPD_CONF/ and AC_CHECK_HEADERS(ocilib.h) #1837 #1842

fixes #1837
fixes #1842

---

 configure    |   11 ++++++++---
 configure.in |    4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 5a6fc76..2c3b847 100755
--- a/configure
+++ b/configure
@@ -5294,7 +5294,7 @@ if test x$MAIL_PROG = x; then
 fi
 
 
-HTTP_CONF=no
+HTTPD_CONF=no
 
 # Check whether --with-httpd_conf was given.
 if test "${with_httpd_conf+set}" = set; then :
@@ -6330,12 +6330,17 @@ fi
 		CFLAGS="$CFLAGS -I$OCILIB_INC -DOCI_IMPORT_RUNTIME -DOCI_CHARSET_ANSI"
 		LDFLAGS="$LDFLAGS -L$OCILIB_LIB"
 
-				ac_fn_c_check_header_compile "$LINENO" "ocilib.h" "ac_cv_header_ocilib_h" "\"${OCILIB_INC}\"
-"
+				for ac_header in ocilib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ocilib.h" "ac_cv_header_ocilib_h" "$ac_includes_default"
 if test "x$ac_cv_header_ocilib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OCILIB_H 1
+_ACEOF
 
 fi
 
+done
 
 
 
diff --git a/configure.in b/configure.in
index e049377..00d5b2c 100644
--- a/configure.in
+++ b/configure.in
@@ -286,7 +286,7 @@ fi
 AC_SUBST(MAIL_PROG)
 
 dnl Check for location of Apache conf.d directory
-HTTP_CONF=no
+HTTPD_CONF=no
 AC_ARG_WITH(httpd_conf,AC_HELP_STRING([--with-httpd-conf=<path_to_conf>],[sets path to Apache conf.d directory]),HTTPD_CONF=$withval,HTTPD_CONF=no)
 if test x$HTTPD_CONF = xno; then
 	if test -d /etc/httpd/conf.d; then
@@ -853,7 +853,7 @@ if test x$USE_IDOUTILS = xyes; then
 		LDFLAGS="$LDFLAGS -L$OCILIB_LIB"
 
 		dnl check and include ocilib.h
-		AC_CHECK_HEADER(ocilib.h, [], [], ["${OCILIB_INC}"])
+		AC_CHECK_HEADERS(ocilib.h)
 
 		dnl check and include ocilib library, at runtime
 





More information about the icinga-checkins mailing list