Commit 35787a96 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get buildconf working in the new repository. Nothing builds, but we can 

at least configure everything.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87176 13f79535-47bb-0310-9956-ffa450edef68
parent e0a330c8

build/MakeEtags

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# This file illustrates how to generate a useful TAGS file via etags

# for emacs.  This should be invoked from the src directory i.e.:

#   > helpers/MakeEtags

#   > build/MakeEtags

# and will create a TAGS file in the src directory.



# This script falls under the Apache License.

build/build.mk

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
STAMP = buildmk.stamp



all: $(STAMP) generated_lists

	@if [ ! -d lib/apr ]; then \

	@if [ ! -d srclib/apr ]; then \

	    echo "APR not found."; \

	    echo "Please check-out a working version of APR, the anonymous"; \

	    echo "CVS root is :pserver:anoncvs@www.apache.org:/home/cvspublic"; \
@@ -70,13 +70,13 @@ all: $(STAMP) generated_lists 
	@$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk



generated_lists:

	@libpath=`helpers/PrintPath libtoolize`; \

	@libpath=`build/PrintPath libtoolize`; \

	if [ "x$$libpath" = "x" ]; then \

		echo "libtoolize not found in path"; \

		exit 1; \

	fi; 

	@echo config_m4_files = `find . -name config.m4` > $@

	@n=`helpers/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@

	@n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@



$(STAMP): build/buildcheck.sh

	@build/buildcheck.sh && touch $(STAMP)

build/build2.mk

+13 −13
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ TOUCH_FILES = mkinstalldirs install-sh missing 
LT_TARGETS = ltconfig ltmain.sh config.guess config.sub



config_h_in = include/ap_config_auto.h.in

apr_private.h_in = lib/apr/include/apr_private.h.in

apr_configure = lib/apr/configure

mm_configure = lib/apr/shmem/unix/mm/configure

pcre_configure = lib/pcre/configure

apr_private.h_in = srclib/apr/include/apr_private.h.in

apr_configure = srclib/apr/configure

mm_configure = srclib/apr/shmem/unix/mm/configure

pcre_configure = srclib/pcre/configure



APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
@@ -83,12 +83,12 @@ all: $(targets) 


libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4



aclocal.m4: acinclude.m4 lib/apr/apr_common.m4 lib/apr/hints.m4 $(libtool_m4)

aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)

	@echo rebuilding $@

	@cat acinclude.m4 $(libtool_m4) > $@



export_lists:

	@build/buildexports.sh main/exports.c lib/apr/apr.exports

	@build/buildexports.sh server/exports.c srclib/apr/apr.exports



$(LT_TARGETS):

	libtoolize $(AMFLAGS) --force
@@ -112,19 +112,19 @@ configure: aclocal.m4 configure.in $(config_m4_files) 
	### to preserve autoconf's exit across the grep?

	-autoconf 2>&1 | grep -v $(cross_compile_warning)



$(apr_private.h_in): $(apr_configure) lib/apr/acconfig.h

$(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h

	@echo rebuilding $@

	@rm -f $@

	(cd lib/apr && autoheader)

	(cd srclib/apr && autoheader)



$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/apr_common.m4 lib/apr/hints.m4

$(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4

	@echo rebuilding $@

	(cd lib/apr && ./buildconf)

	(cd srclib/apr && ./buildconf)



$(pcre_configure): lib/pcre/configure.in

$(pcre_configure): srclib/pcre/configure.in

	@echo rebuilding $@

	(cd lib/pcre && autoconf)

	(cd srclib/pcre && autoconf)



$(mm_configure): $(mm_configure).in

	@echo rebuilding $@

	(cd lib/apr/shmem/unix/mm && autoconf)
 
	(cd srclib/apr/shmem/unix/mm && autoconf)

build/buildexports.sh

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ echo " * the base server uses them." 
echo " */"

echo ""

 

cd lib/apr/include 

cd srclib/apr/include 

for file in *.h

do

    echo "#include \"$file\""

build/fastgen.sh

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ top_builddir=`pwd` 
if test "$mkdir_p" = "yes"; then

  mkdir_p="mkdir -p"

else

  mkdir_p="$top_srcdir/helpers/mkdir.sh"

  mkdir_p="$top_srcdir/build/mkdir.sh"

fi



if test "$bsd_makefile" = "yes"; then