httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1200715 - in /httpd/httpd/trunk: acinclude.m4 buildconf configure.in srclib/libapreq/ srclib/libapreq/Makefile.in srclib/libapreq/configure.in srclib/libapreq/library/ srclib/libapreq/library/Makefile.in
Date Fri, 11 Nov 2011 03:01:34 GMT
Author: jorton
Date: Fri Nov 11 03:01:33 2011
New Revision: 1200715

URL: http://svn.apache.org/viewvc?rev=1200715&view=rev
Log:
A stab at libapreq build integration, still disabled by default.

Added:
    httpd/httpd/trunk/srclib/libapreq/library/Makefile.in
Removed:
    httpd/httpd/trunk/srclib/libapreq/configure.in
Modified:
    httpd/httpd/trunk/acinclude.m4
    httpd/httpd/trunk/buildconf
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/srclib/libapreq/   (props changed)
    httpd/httpd/trunk/srclib/libapreq/Makefile.in
    httpd/httpd/trunk/srclib/libapreq/library/   (props changed)

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1200715&r1=1200714&r2=1200715&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Fri Nov 11 03:01:33 2011
@@ -99,6 +99,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(APU_INCLUDEDIR)
   APACHE_SUBST(APU_VERSION)
   APACHE_SUBST(APU_CONFIG)
+  APACHE_SUBST(APREQ_MAJOR_VERSION)
+  APACHE_SUBST(APREQ_LIBTOOL_VERSION)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 

Modified: httpd/httpd/trunk/buildconf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/buildconf?rev=1200715&r1=1200714&r2=1200715&view=diff
==============================================================================
--- httpd/httpd/trunk/buildconf (original)
+++ httpd/httpd/trunk/buildconf Fri Nov 11 03:01:33 2011
@@ -163,14 +163,6 @@ fi
 
 apr_src_dir=`cd $apr_src_dir && pwd` 
 
-#apreq_configure="srclib/libapreq"
-#echo
-#echo rebuilding $apreq_configure
-#(cd srclib/libapreq && ./buildconf --with-apr="$apr_src_dir") || {
-#    echo "./buildconf failed for apreq"
-#    exit 1
-#}
-
 if [ $apr_major_version -lt 2 ] ; then
     if [ "$apu_src_dir" = "srclib/apr-util" ]; then
         echo rebuilding $aprutil_configure

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1200715&r1=1200714&r2=1200715&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Fri Nov 11 03:01:33 2011
@@ -92,8 +92,6 @@ if test "$apr_found" = "reconfig"; then
                     [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
                     [--enable-layout=*|\'--enable-layout=*])
   dnl We must be the first to build and the last to be cleaned
-dnl  AP_BUILD_SRCLIB_DIRS="apr libapreq $AP_BUILD_SRCLIB_DIRS"
-dnl  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS libapreq apr"
   AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
   AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
 
@@ -121,10 +119,6 @@ APR_VERSION=`$apr_config --version`
 apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
 APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
 
-dnl echo $ac_n "${nl}Configuring Apache Request Library...${nl}"
-dnl APR_SUBDIR_CONFIG(srclib/libapreq, [--with-apr=../apr/apr-2-config --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir])
-dnl APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/srclib/libapreq/include])
-
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
 if test "x${apr_major_version}" = "x2"; then
@@ -744,6 +738,23 @@ AC_ARG_ENABLE(load-all-modules,APACHE_HE
   LOAD_ALL_MODULES="no"
 ])
 
+### libapreq build integration.
+if test -d $abs_srcdir/srclib/libapreq && false; then
+   get_version="$abs_srcdir/build/get-version.sh"
+   version_hdr="$abs_srcdir/srclib/libapreq/include/apreq_version.h"
+   APREQ_MAJOR_VERSION="`$get_version major $version_hdr APREQ`"
+   APREQ_LIBTOOL_VERSION="`$get_version libtool $version_hdr APREQ`"
+
+   APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/srclib/libapreq/include])
+   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS libapreq"
+   AP_CLEAN_SRCLIB_DIRS="libapreq $AP_BUILD_SRCLIB_DIRS"
+
+   APACHE_FAST_OUTPUT(srclib/libapreq/Makefile srclib/libapreq/library/Makefile)
+   
+   AC_CONFIG_FILES([srclib/libapreq/apreq2-config])
+   AC_CONFIG_COMMANDS([apreq], [chmod 755 srclib/libapreq/apreq2-config])
+fi
+
 APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
 APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
 APACHE_FAST_OUTPUT(support/Makefile)

Propchange: httpd/httpd/trunk/srclib/libapreq/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 11 03:01:33 2011
@@ -1,4 +1,2 @@
 .deps
-.libs
-Makefile.in
 Makefile

Modified: httpd/httpd/trunk/srclib/libapreq/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/srclib/libapreq/Makefile.in?rev=1200715&r1=1200714&r2=1200715&view=diff
==============================================================================
--- httpd/httpd/trunk/srclib/libapreq/Makefile.in (original)
+++ httpd/httpd/trunk/srclib/libapreq/Makefile.in Fri Nov 11 03:01:33 2011
@@ -1,94 +1,15 @@
-#
-# Top-level Makefile for APREQ
-#
-CPP = @CPP@
 
-# gets substituted into some targets
-APREQ_MAJOR_VERSION=@APREQ_MAJOR_VERSION@
-APREQ_MINOR_VERSION=@APREQ_MINOR_VERSION@
-APREQ_PATCH_VERSION=@APREQ_PATCH_VERSION@
-APREQ_DOTTED_VERSION=@APREQ_DOTTED_VERSION@
-APREQ_LIBTOOL_VERSION=@APREQ_LIBTOOL_VERSION@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INCLUDES = @APREQ_INCLUDES@ @APREQ_PRIV_INCLUDES@ @APR_INCLUDES@
-APREQ_LDFLAGS = @APREQ_LDFLAGS@
-APREQ_LIBS = @APREQ_LIBS@
-
-TARGET_LIB = lib@APREQ_LIBNAME@.la
-INSTALL_SUBDIRS =
-EXTRA_SOURCE_DIRS =
-APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
+INSTALL_TARGETS = install-apreq-config
+BUILD_SUBDIRS = library
+CLEAN_SUBDIRS = library
 APREQ_CONFIG = apreq2-config
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-TARGETS = $(TARGET_LIB) apreq.exp
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-@INCLUDE_OUTPUTS@
-
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(APREQ_LIBTOOL_VERSION)
$(ALL_LDFLAGS) -o $@
-
-CLEAN_SUBDIRS = test
 
-CLEAN_TARGETS = exports.c export_vars.c apreq.exp .make.dirs apreq2-config.out
-DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
-	export_vars.sh $(APREQ_CONFIG) build/rules.mk \
-	apr-util.pc build/pkg/pkginfo
-EXTRACLEAN_TARGETS = configure aclocal.m4 \
-	exports.c build-outputs.mk \
-	build/apr_common.m4 build/find_apr.m4 build/install.sh \
-	build/config.guess build/config.sub
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-includedir=@includedir@
-top_srcdir=@abs_srcdir@
-top_blddir=@abs_builddir@
+include $(top_builddir)/build/rules.mk
 
 # Create apu-config script suitable for the install tree
-apreq2-config.out: $(APREQ_CONFIG)
-	sed 's,^\(location=\).*$$,\1installed,' < $(APREQ_CONFIG) > $@
-
-install: $(TARGET_LIB) apreq2-config.out
-	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
-		$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
-	done
-	echo $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
-	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
-		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	done
-	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) apreq.exp $(DESTDIR)$(libdir)
-	$(INSTALL) -m 755 apreq2-config.out $(DESTDIR)$(bindir)/$(APREQ_CONFIG)
-
-$(TARGET_LIB): $(OBJECTS)
-	$(LINK) @lib_target@ $(ALL_LIBS) $(APREQ_LDFLAGS) $(APREQ_LIBS)
-
-exports.c: $(HEADERS)
-	$(APR_MKEXPORT) $(HEADERS) > $@
-
-export_vars.c: $(HEADERS)
-	$(APR_MKVAREXPORT) $(HEADERS) > $@
-
-apreq.exp: exports.c export_vars.c
-	@echo "#! lib@APREQ_LIBNAME@.so" > $@
-	@echo "* This file was AUTOGENERATED at build time." >> $@
-	@echo "* Please do not edit by hand." >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/'
>> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d'
>> $@
-
-dox:
-	doxygen $(top_srcdir)/docs/doxygen.conf
+$(APREQ_CONFIG).out: $(APREQ_CONFIG)
+	sed 's,^\(location=\).*$$,\1installed,' < $(APREQ_CONFIG).in > $(APREQ_CONFIG)
 
-test: check
-check: $(TARGET_LIB)
-	cd test && $(MAKE) check
+install-apreq-config: $(APREQ_CONFIG)
+	@$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 $(APREQ_CONFIG) $(DESTDIR)$(bindir)/$(APREQ_CONFIG)

Propchange: httpd/httpd/trunk/srclib/libapreq/library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 11 03:01:33 2011
@@ -0,0 +1,3 @@
+Makefile
+.deps
+*.lo

Added: httpd/httpd/trunk/srclib/libapreq/library/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/srclib/libapreq/library/Makefile.in?rev=1200715&view=auto
==============================================================================
--- httpd/httpd/trunk/srclib/libapreq/library/Makefile.in (added)
+++ httpd/httpd/trunk/srclib/libapreq/library/Makefile.in Fri Nov 11 03:01:33 2011
@@ -0,0 +1,15 @@
+TARGETS = $(LIBRARY)
+OBJECTS = cookie.lo error.lo module.lo module_cgi.lo module_custom.lo	\
+	param.lo parser.lo parser_header.lo parser_multipart.lo		\
+	parser_urlencoded.lo util.lo version.lo
+LIBRARY = libapreq-2.la
+INSTALL_TARGETS = install-library
+
+include $(top_builddir)/build/rules.mk
+
+$(LIBRARY): $(OBJECTS)
+	$(LINK) -shared $(APREQ_LIBTOOL_VERSION) -rpath $(libdir) $(OBJECTS) $(EXTRA_LIBS) $(AP_LIBS)
+
+install-library: $(LIBRARY)
+	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)



Mime
View raw message