You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2008/03/04 20:34:02 UTC
svn commit: r633601 - in /tcl/websh/trunk/src/unix: Makefile.in configure.in
Author: ronnie
Date: Tue Mar 4 11:33:59 2008
New Revision: 633601
URL: http://svn.apache.org/viewvc?rev=633601&view=rev
Log:
- added --with-aprinclud and --with-apuinclude variables to configure apr
Modified:
tcl/websh/trunk/src/unix/Makefile.in
tcl/websh/trunk/src/unix/configure.in
Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/Makefile.in?rev=633601&r1=633600&r2=633601&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Tue Mar 4 11:33:59 2008
@@ -140,7 +140,7 @@
MODULE_LIB_SUFFIX = $(VERSION).so
UNSHARED_LIB_SUFFIX = @UNSHARED_LIB_SUFFIX@
-HTTPD_INCLUDES = @HTTPD_INCLUDES@
+HTTPD_INCLUDES = @HTTPD_INCLUDES@@APR_INCLUDES@@APU_INCLUDES@
# needed for Darwin (OS X) only
HTTPD_BIN = @HTTPD_BIN@
Modified: tcl/websh/trunk/src/unix/configure.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/configure.in?rev=633601&r1=633600&r2=633601&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/configure.in (original)
+++ tcl/websh/trunk/src/unix/configure.in Tue Mar 4 11:33:59 2008
@@ -126,7 +126,7 @@
#--------------------------------------------------------------------
-# --with-httpd-include
+# --with-httpd-include and --with-httpd (for Darwin)
#--------------------------------------------------------------------
AC_MSG_CHECKING(for httpd header files)
AC_ARG_WITH(httpdinclude, [ --with-httpdinclude directory containing the apache header files.], with_httpdinclude=${withval}, with_httpdinclude=NA)
@@ -161,7 +161,7 @@
if test "`uname -s`" = "Darwin" ; then
AC_MSG_CHECKING(for httpd binary)
- AC_ARG_WITH(httpd, [ --with-httpd apache binary], with_httpd=${withval}, with_httpd=NA)
+ AC_ARG_WITH(httpd, [ --with-httpd apache binary (Darwin only)], with_httpd=${withval}, with_httpd=NA)
if test x"${with_httpd}" != xNA ; then
if test -f "${with_httpd}" ; then
echo "found ${with_httpd}"
@@ -187,6 +187,45 @@
HTTPD_BIN=
fi
AC_SUBST(HTTPD_BIN)
+
+#--------------------------------------------------------------------
+# --with-apr and --with-apr-util
+#--------------------------------------------------------------------
+# needed for Apache httpd 2.2.4 (and others) if Apache httpd is configured
+# with --with-apr and/or --with-apr-util -> header files are missing in
+# installation of httpd
+
+AC_ARG_WITH(aprinclude, [ --with-aprinclude directory containing apr header files.], with_aprinclude=${withval}, with_aprinclude=NA)
+
+if test x"${with_aprinclude}" != xNA ; then
+ AC_MSG_CHECKING(for apache runtime (apr) header files)
+ if test -f "${with_aprinclude}/apr.h" ; then
+ echo "found ${with_aprinclude}"
+ APR_INCLUDES=" -I\"${with_aprinclude}\""
+ AC_SUBST(APR_INCLUDES)
+ else
+ AC_MSG_ERROR([${with_aprinclude}: directory does not contain apr header file apr.h])
+ fi
+else
+ APR_INCLUDES=
+ AC_SUBST(APR_INCLUDES)
+fi
+
+AC_ARG_WITH(apuinclude, [ --with-apuinclude directory containing apr util header files.], with_apuinclude=${withval}, with_apuinclude=NA)
+
+if test x"${with_apuinclude}" != xNA ; then
+ AC_MSG_CHECKING(for apache runtime utils (apu) header files)
+ if test -f "${with_apuinclude}/apr_hooks.h" ; then
+ echo "found ${with_apuinclude}"
+ APU_INCLUDES=" -I\"${with_apuinclude}\""
+ AC_SUBST(APU_INCLUDES)
+ else
+ AC_MSG_ERROR([${with_apuinclude}: directory does not contain apu header file apr_hooks.h])
+ fi
+else
+ APU_INCLUDES=
+ AC_SUBST(APU_INCLUDES)
+fi
#--------------------------------------------------------------------
# A few miscellaneous platform-specific items:
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org