Commit 832439de authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Apache builds again, although the test directory doesn't. I will work on 

the test directory soon.  The server does NOT currently run, but it does
build cleanly.


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

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
SUBDIRS = modules os server srclib support test



PROGRAM_NAME         = $(progname)

PROGRAM_SOURCES      = modules.c buildmark.c

PROGRAM_SOURCES      = modules.c

PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)

PROGRAM_DEPENDENCIES = \

  $(BUILTIN_LIBS) \

  $(MPM_LIB) \

  main/libmain.la \

  server/libmain.la \

  os/$(OS_DIR)/libos.la \

  $(AP_LIBS)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ apache_need_expat=yes 


dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need

dnl AP_LIBS specifies the actual libraries. note we have some required libs.

AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/.libs/libaprutil.la"

AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"



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

  AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
@@ -210,7 +210,7 @@ else 
fi



APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 

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

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

APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)

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

for i in $AP_LIB_DIRS; do

server/Makefile.in

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


CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h



SUBDIRS = mpm



LTLIBRARY_NAME    = libmain.la

LTLIBRARY_SOURCES = \

    uri_delims.h test_char.h \
@@ -8,7 +10,7 @@ LTLIBRARY_SOURCES = \ 
	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \

	rfc1413.c connection.c listen.c \

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

	util_filter.c exports.c

	util_filter.c exports.c buildmark.c



include $(top_srcdir)/build/ltlib.mk

support/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab 
targets  = $(PROGRAMS)



PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)

PROGRAM_DEPENDENCIES = ../srclib/apr/$(LIBPRE)apr.a \

	../srclib/apr-util/.libs/libaprutil.a

PROGRAM_DEPENDENCIES = \

	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a



include $(top_srcdir)/build/rules.mk