Commit 53be7815 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Force all Apache functions to be linked into the executable, whether they 

are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


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

CHANGES

+7 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1

  *) Get the functions in server/linked into the server, regardless of

     which modules linked into the server.  This uses the same hack 

     for Apache that we use for APR and apr-util to ensure all of the

     necessary functions are linked.  As a part of thise, the CHARSET_EBCIDC

     was renamed to AP_CHARSET_EBCDIC for namespace protection, and to make

     the scripts a bit easier.

     [Ryan Bloom]



  *) Rework the RFC1413 handling to make it thread-safe, use a timeout

     on the query, and remove IPv4 dependencies.  [Jeff Trawick]

acinclude.m4

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(sysconfdir)

  APACHE_SUBST(progname)

  APACHE_SUBST(prefix)

  APACHE_SUBST(AWK)

  APACHE_SUBST(CC)

  APACHE_SUBST(CFLAGS)

  APACHE_SUBST(CPPFLAGS)
@@ -216,7 +217,7 @@ int main(void) { 
  ac_cv_ebcdic="no"

])])

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

    AC_DEFINE(CHARSET_EBCDIC,, [Define if system uses EBCDIC])

    AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])

  fi

])

build/buildexports.awk

+2 −2
Original line number Diff line number Diff line 
/^APR_/     { print "#if", $1 }

/^(APR?_|defined)/     { print "#if", $1 }

/^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" }

/^\/APR_/   { print "#endif /*", substr($1,2), "*/" }
 
/^\/(APR?_|defined)/   { print "#endif /*", substr($1,2), "*/" }

build/buildexports.sh

+4 −3
Original line number Diff line number Diff line 
#! /bin/sh



if test -z "$1"; then

    echo "USAGE: $0 SRCLIB-DIRECTORY"

    echo "USAGE: $0 HTTPD-DIRECTORY"

    echo ""

    echo "for example: $0 ../srclib"

    echo "for example: $0 .."

    exit 1

fi
@@ -12,9 +12,10 @@ echo " * link all of the APR functions into server regardless of whether" 
echo " * the base server uses them."

echo " */"

echo ""

echo "#define CORE_PRIVATE"



cur_dir="`pwd`"

for dir in $1/apr/include $1/apr-util/include

for dir in $1/srclib/apr/include $1/srclib/apr-util/include $1/include

do

    cd $dir

    for file in *.h; do

include/ap_config.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline) 
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE

#endif



#if defined(CHARSET_EBCDIC) && !defined(APACHE_XLATE)

#if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)

#define APACHE_XLATE

#endif