You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by so...@apache.org on 2005/09/17 21:19:48 UTC
svn commit: r289840 - in /httpd/mod_smtpd/trunk: Makefile.in configure.ac
Author: soc-rian
Date: Sat Sep 17 12:19:43 2005
New Revision: 289840
URL: http://svn.apache.org/viewcvs?rev=289840&view=rev
Log:
Added checks for libapreq2, a requirement.
Modified:
httpd/mod_smtpd/trunk/Makefile.in
httpd/mod_smtpd/trunk/configure.ac
Modified: httpd/mod_smtpd/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/Makefile.in?rev=289840&r1=289839&r2=289840&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/Makefile.in (original)
+++ httpd/mod_smtpd/trunk/Makefile.in Sat Sep 17 12:19:43 2005
@@ -1,6 +1,6 @@
APXS=@APXS_BIN@
-CFLAGS=-Wall
-APXSFLAGS=-L`$(APXS) -q LIBDIR`
+CFLAGS=-Wall @APREQ2_INCLUDEDIR@
+APXSFLAGS=@APREQ2_LIBDIR@
LIBS=-lapreq2
SMTPD_SRC=smtp_core.c smtp_protocol.c smtp_util.c smtp_filters.c
Modified: httpd/mod_smtpd/trunk/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/configure.ac?rev=289840&r1=289839&r2=289840&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/configure.ac (original)
+++ httpd/mod_smtpd/trunk/configure.ac Sat Sep 17 12:19:43 2005
@@ -25,6 +25,32 @@
fi
])
+AC_DEFUN([CHECK_APREQ2],[dnl
+ AC_ARG_WITH(
+ libapreq2,
+ [ --with-libapreq2[=PATH_TO_LIBAPREQ2] APREQ2 LIB LOCATION],
+ APREQ2_LOC="$withval",
+ )
+
+ AC_MSG_CHECKING(for libapreq2)
+
+ if test -s $APREQ2_LOC; then
+ APREQ2_LOC=`$APXS_BIN -q LIBDIR`
+ fi
+
+ if ld -L${APREQ2_LOC} -lapreq2 &&
+ test -d ${APREQ2_LOC}/../include/apreq2; then
+ APREQ2_LIBDIR="-L${APREQ2_LOC}"
+ APREQ2_INCLUDEDIR="-I${APREQ2_LOC}/../include"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([*** libapreq2 not found! ${APREQ2_LOC}/../include])
+ fi
+ AC_SUBST(APREQ2_LIBDIR)
+ AC_SUBST(APREQ2_INCLUDEDIR)
+])
+
# Define a macro that is used to parse a --with-apxs parameter
# The macro is named "APACHE_DIR"
AC_DEFUN([APACHE_DIR],[dnl
@@ -59,6 +85,8 @@
APACHE_DIR
CHECK_VERSION(2.0)
+
+CHECK_APREQ2
# Write the Makefile
AC_OUTPUT(Makefile)