Commit 8c3d9ea7 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get base Apache to build properly. This doesn't solve the problem of 

not having apr-util, but we should be getting to the link stage now.


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

.cvsignore

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ aclocal.m4 
.deps

generated_lists

buildmk.stamp

config.log

Makefile

libtool

config.status

modules.c

config.cache

config_vars.mk

build/rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ INSTALL = $(abs_srcdir)/build/install.sh -c 
INSTALL_DATA = $(INSTALL) -m 644

INSTALL_PROGRAM = $(INSTALL) -m 755



DEFS = -I. -I$(srcdir) -I$(top_srcdir)/modules/mpm/$(MPM_NAME)

DEFS = -I. -I$(srcdir) -I$(top_srcdir)/server/mpm/$(MPM_NAME)



# Suffixes

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -209,10 +209,10 @@ else 
		[byte order is unknown due to cross-compilation])

fi



APACHE_FAST_OUTPUT(Makefile modules/Makefile) 

APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 

APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile)

APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)

APACHE_FAST_OUTPUT(support/Makefile test/Makefile)

APACHE_FAST_OUTPUT(support/Makefile test/Makefile srclib/pcre/Makefile)

for i in $AP_LIB_DIRS; do

  APACHE_FAST_OUTPUT(srclib/$i/Makefile)

done

server/Makefile.in

+2 −3
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h 
LTLIBRARY_NAME    = libmain.la

LTLIBRARY_SOURCES = \

    uri_delims.h test_char.h \

	http_config.c http_core.c http_log.c http_main.c \

	http_protocol.c http_request.c http_vhost.c util.c util_date.c \

	config.c log.c main.c vhost.c util.c util_date.c \

	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \

	rfc1413.c http_connection.c listen.c \

	rfc1413.c connection.c listen.c \

        mpm_common.c util_charset.c util_debug.c util_xml.c \

	util_filter.c exports.c

srclib/Makefile.in

+1 −1
Original line number Diff line number Diff line 


SUBDIRS = apr pcre aputil $(AP_LIB_DIRS)

SUBDIRS = apr pcre $(AP_LIB_DIRS)



include $(top_srcdir)/build/rules.mk