Commit 65849c69 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get Apache to configure completely again. This still doesn't build, but 

now we are getting very close.


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

Makefile.in

+4 −5
Original line number Diff line number Diff line 


SUBDIRS = ap lib main modules os support

SUBDIRS = modules os server srclib support test



PROGRAM_NAME         = $(progname)

PROGRAM_SOURCES      = modules.c buildmark.c
@@ -9,7 +9,6 @@ PROGRAM_DEPENDENCIES = \ 
  $(MPM_LIB) \

  main/libmain.la \

  os/$(OS_DIR)/libos.la \

  ap/libap.la \

  $(AP_LIBS)



PROGRAMS        = $(PROGRAM_NAME)
@@ -49,7 +48,7 @@ htdocs-srcdir = $(srcdir)/../htdocs 


docs: include/*.h

	mkdir -p ./docs/api

	lib/apr/helpers/scandoc -ihelpers/default.pl -p./docs/api/ ./include/*.h

	srclib/apr/helpers/scandoc -ihelpers/default.pl -p./docs/api/ ./include/*.h



install-htdocs:

	@echo Installing HTML documents
@@ -103,6 +102,6 @@ install-include: 
            cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \

        fi;

	@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)

	@cp -p $(srcdir)/lib/expat-lite/*.h $(includedir)/xml

	@cp -p lib/apr/include/*.h $(srcdir)/lib/apr/include/*.h $(includedir)/apr

	@cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)/xml

	@cp -p srclib/apr/include/*.h $(srcdir)/srclib/apr/include/*.h $(includedir)/apr

	@chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h

configure.in

+10 −11
Original line number Diff line number Diff line
@@ -173,20 +173,19 @@ AC_ARG_WITH(program-name, 
dnl ### util_xml is always included, so we always need Expat (for now)

apache_need_expat=yes



dnl AP_LIB_DIRS specifies the additional libs from src/lib/ that we need

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="lib/pcre/libpcre.la lib/aputil/libaputil.la"

INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/aputil"

AP_LIBS="srclib/pcre/libpcre.la"



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

  AP_LIB_DIRS="$AP_LIB_DIRS sdbm"

  AP_LIBS="$AP_LIBS lib/sdbm/libsdbm.la"

  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/sdbm"

  AP_LIBS="$AP_LIBS srclib/sdbm/libsdbm.la"

  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/sdbm"

fi

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

  AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"

  AP_LIBS="$AP_LIBS lib/expat-lite/libexpat.la"

  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/expat-lite"

  AP_LIBS="$AP_LIBS srclib/expat-lite/libexpat.la"

  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/expat-lite"

fi



dnl APR should go after the other libs, so the right symbols can be picked up
@@ -210,12 +209,12 @@ else 
		[byte order is unknown due to cross-compilation])

fi



APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)

APACHE_FAST_OUTPUT(modules/Makefile os/Makefile)

APACHE_FAST_OUTPUT(Makefile modules/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(lib/pcre/Makefile lib/aputil/Makefile)

for i in $AP_LIB_DIRS; do

  APACHE_FAST_OUTPUT(lib/$i/Makefile)

  APACHE_FAST_OUTPUT(srclib/$i/Makefile)

done



dnl ## Run configure for packages Apache uses

modules/Makefile.in

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


SUBDIRS = mpm $(MODULE_DIRS)

SUBDIRS = $(MODULE_DIRS)



include $(top_srcdir)/build/rules.mk

modules/loggers/config.m4

+1 −1
Original line number Diff line number Diff line 
dnl modules enabled in this directory by default

APACHE_MODPATH_INIT(standard)

APACHE_MODPATH_INIT(loggers)



dnl APACHE_MODULE(vhost_alias,blabla)

server/mpm/beos/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ dnl ## XXX - Need a more thorough check of the proper flags to use 
if test "$MPM_NAME" = "beos" ; then

    apache_apr_flags="--enable-threads"



    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)

    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)

fi