Commit 6675bea4 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1780441, r1780470, r1795928 from trunk: 

buildconf: allow configuration without APR sources

Previously we required copying the APR (and APR-util) source code into
srclib or some other location on disk in order to build httpd directly
from source. This is annoying if you're on a distribution that already
has the required files in its APR dev packages.

Practically speaking, if you're not building an official distribution
tarball, you only need the following files:

1) config.guess
2) config.sub
3) find_apr.m4
4) find_apu.m4
5) PrintPath

1 and 2 come from automake. 3 and 4 are included in some distributions'
(e.g. Debian's) development packages for APR/-util. That leaves
PrintPath, which has not changed meaningfully in over a decade and is
checked in completely here.

Passing an apr-config executable to buildconf's --with-apr option will
now enable a mode in which the above files (minus PrintPath) are copied
from their respective homes, removing the need for APR sources on disk.
Otherwise, if a source tree is passed, the current behavior is retained
and all of the above files are copied from APR directly.

buildconf: add --help for the new behavior

buildconf's behavior is a little complicated (and was made more so with
apr-config mode), so add some self-documentation.

buildconf: check in APR[-util] m4 macros

Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.

Submitted by: jchampion
Reviewed by: jchampion, jim, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807761 13f79535-47bb-0310-9956-ffa450edef68
parent 40e03b31

STATUS

+0 −10
Original line number Diff line number Diff line
@@ -119,16 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .

     +1: jfclere, jim, covener



  *) buildconf: add an apr-config mode, which allows builds to proceed without

                APR source code as long as a valid APR installation exists.

                Involves checking in the latest versions of APR's m4 files and

                the PrintPath helper.

     trunk patch: https://svn.apache.org/r1780441

                  https://svn.apache.org/r1780470

                  https://svn.apache.org/r1795928

     2.4.x patch: svn merge -r 1780253:HEAD ^/httpd/httpd/branches/trunk-buildconf-noapr

     +1: jchampion, jim, ylavic



  *) proxy: Ensure updatelbstatus() is NULL if not-implemented

     trunk patch: http://svn.apache.org/r1802845

     2.4.x patch: trunk patch works

build/PrintPath

0 → 100755
+130 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# Licensed to the Apache Software Foundation (ASF) under one or more

# contributor license agreements.  See the NOTICE file distributed with

# this work for additional information regarding copyright ownership.

# The ASF licenses this file to You under the Apache License, Version 2.0

# (the "License"); you may not use this file except in compliance with

# the License.  You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

#

# Look for program[s] somewhere in $PATH.

#

# Options:

#  -s

#    Do not print out full pathname. (silent)

#  -pPATHNAME

#    Look in PATHNAME instead of $PATH

#

# Usage:

#  PrintPath [-s] [-pPATHNAME] program [program ...]

#

# Initially written by Jim Jagielski for the Apache configuration mechanism

#  (with kudos to Kernighan/Pike)



##

# Some "constants"

##

pathname=$PATH

echo="yes"



##

# Find out what OS we are running for later on

##

os=`(uname) 2>/dev/null`



##

# Parse command line

##

for args in $*

do

    case $args in

	-s  ) echo="no" ;;

	-p* ) pathname="`echo $args | sed 's/^..//'`" ;;

	*   ) programs="$programs $args" ;;

    esac

done



##

# Now we make the adjustments required for OS/2 and everyone

# else :)

#

# First of all, all OS/2 programs have the '.exe' extension.

# Next, we adjust PATH (or what was given to us as PATH) to

# be whitespace separated directories.

# Finally, we try to determine the best flag to use for

# test/[] to look for an executable file. OS/2 just has '-r'

# but with other OSs, we do some funny stuff to check to see

# if test/[] knows about -x, which is the prefered flag.

##



if [ "x$os" = "xOS/2" ]

then

    ext=".exe"

    pathname=`echo -E $pathname |

     sed 's/^;/.;/

	  s/;;/;.;/g

	  s/;$/;./

	  s/;/ /g

	  s/\\\\/\\//g' `

    test_exec_flag="-r"

else

    ext=""	# No default extensions

    pathname=`echo $pathname |

     sed 's/^:/.:/

	  s/::/:.:/g

	  s/:$/:./

	  s/:/ /g' `

    # Here is how we test to see if test/[] can handle -x

    testfile="pp.t.$$"



    cat > $testfile <<ENDTEST

#!/bin/sh

if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then

    exit 0

fi

exit 1

ENDTEST



    if `/bin/sh $testfile 2>/dev/null`; then

	test_exec_flag="-x"

    else

	test_exec_flag="-r"

    fi

    rm -f $testfile

fi



for program in $programs

do

    for path in $pathname

    do

	if [ $test_exec_flag $path/${program}${ext} ] && \

	   [ ! -d $path/${program}${ext} ]; then

	    if [ "x$echo" = "xyes" ]; then

		echo $path/${program}${ext}

	    fi

	    exit 0

	fi



# Next try without extension (if one was used above)

	if [ "x$ext" != "x" ]; then

            if [ $test_exec_flag $path/${program} ] && \

               [ ! -d $path/${program} ]; then

                if [ "x$echo" = "xyes" ]; then

                    echo $path/${program}

                fi

                exit 0

            fi

        fi

    done

done

exit 1

build/apr_common.m4

0 → 100644
+990 −0

File added.

Preview size limit exceeded, changes collapsed.

build/find_apr.m4

0 → 100644
+202 −0
Original line number Diff line number Diff line 
dnl -------------------------------------------------------- -*- autoconf -*-

dnl Licensed to the Apache Software Foundation (ASF) under one or more

dnl contributor license agreements.  See the NOTICE file distributed with

dnl this work for additional information regarding copyright ownership.

dnl The ASF licenses this file to You under the Apache License, Version 2.0

dnl (the "License"); you may not use this file except in compliance with

dnl the License.  You may obtain a copy of the License at

dnl

dnl     http://www.apache.org/licenses/LICENSE-2.0

dnl

dnl Unless required by applicable law or agreed to in writing, software

dnl distributed under the License is distributed on an "AS IS" BASIS,

dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

dnl See the License for the specific language governing permissions and

dnl limitations under the License.



dnl

dnl find_apr.m4 : locate the APR include files and libraries

dnl

dnl This macro file can be used by applications to find and use the APR

dnl library. It provides a standardized mechanism for using APR. It supports

dnl embedding APR into the application source, or locating an installed

dnl copy of APR.

dnl

dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,

dnl              detailed-check)

dnl

dnl   where srcdir is the location of the bundled APR source directory, or

dnl   empty if source is not bundled.

dnl

dnl   where builddir is the location where the bundled APR will will be built,

dnl   or empty if the build will occur in the srcdir.

dnl

dnl   where implicit-install-check set to 1 indicates if there is no

dnl   --with-apr option specified, we will look for installed copies.

dnl

dnl   where acceptable-majors is a space separated list of acceptable major

dnl   version numbers. Often only a single major version will be acceptable.

dnl   If multiple versions are specified, and --with-apr=PREFIX or the

dnl   implicit installed search are used, then the first (leftmost) version

dnl   in the list that is found will be used.  Currently defaults to [0 1].

dnl

dnl   where detailed-check is an M4 macro which sets the apr_acceptable to

dnl   either "yes" or "no". The macro will be invoked for each installed

dnl   copy of APR found, with the apr_config variable set appropriately.

dnl   Only installed copies of APR which are considered acceptable by

dnl   this macro will be considered found. If no installed copies are

dnl   considered acceptable by this macro, apr_found will be set to either

dnl   either "no" or "reconfig".

dnl

dnl Sets the following variables on exit:

dnl

dnl   apr_found : "yes", "no", "reconfig"

dnl

dnl   apr_config : If the apr-config tool exists, this refers to it. If

dnl                apr_found is "reconfig", then the bundled directory

dnl                should be reconfigured *before* using apr_config.

dnl

dnl Note: this macro file assumes that apr-config has been installed; it

dnl       is normally considered a required part of an APR installation.

dnl

dnl If a bundled source directory is available and needs to be (re)configured,

dnl then apr_found is set to "reconfig". The caller should reconfigure the

dnl (passed-in) source directory, placing the result in the build directory,

dnl as appropriate.

dnl

dnl If apr_found is "yes" or "reconfig", then the caller should use the

dnl value of apr_config to fetch any necessary build/link information.

dnl



AC_DEFUN([APR_FIND_APR], [

  apr_found="no"



  if test "$target_os" = "os2-emx"; then

    # Scripts don't pass test -x on OS/2

    TEST_X="test -f"

  else

    TEST_X="test -x"

  fi



  ifelse([$4], [], [

         ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]))

         acceptable_majors="0 1"],

         [acceptable_majors="$4"])



  apr_temp_acceptable_apr_config=""

  for apr_temp_major in $acceptable_majors

  do

    case $apr_temp_major in

      0)

      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"

      ;;

      *)

      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"

      ;;

    esac

  done



  AC_MSG_CHECKING(for APR)

  AC_ARG_WITH(apr,

  [  --with-apr=PATH         prefix for installed APR or the full path to 

                             apr-config],

  [

    if test "$withval" = "no" || test "$withval" = "yes"; then

      AC_MSG_ERROR([--with-apr requires a directory or file to be provided])

    fi



    for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config

    do

      for lookdir in "$withval/bin" "$withval"

      do

        if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then

          apr_config="$lookdir/$apr_temp_apr_config_file"

          ifelse([$5], [], [], [

          apr_acceptable="yes"

          $5

          if test "$apr_acceptable" != "yes"; then

            AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])

            continue

          fi])

          apr_found="yes"

          break 2

        fi

      done

    done



    if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then

      apr_config="$withval"

      ifelse([$5], [], [apr_found="yes"], [

          apr_acceptable="yes"

          $5

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

                apr_found="yes"

          fi])

    fi



    dnl if --with-apr is used, it is a fatal error for its argument

    dnl to be invalid

    if test "$apr_found" != "yes"; then

      AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])

    fi

  ],[

    dnl If we allow installed copies, check those before using bundled copy.

    if test -n "$3" && test "$3" = "1"; then

      for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config

      do

        if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then

          apr_config="$apr_temp_apr_config_file"

          ifelse([$5], [], [], [

          apr_acceptable="yes"

          $5

          if test "$apr_acceptable" != "yes"; then

            AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])

            continue

          fi])

          apr_found="yes"

          break

        else

          dnl look in some standard places

          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do

            if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then

              apr_config="$lookdir/bin/$apr_temp_apr_config_file"

              ifelse([$5], [], [], [

              apr_acceptable="yes"

              $5

              if test "$apr_acceptable" != "yes"; then

                AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])

                continue

              fi])

              apr_found="yes"

              break 2

            fi

          done

        fi

      done

    fi

    dnl if we have not found anything yet and have bundled source, use that

    if test "$apr_found" = "no" && test -d "$1"; then

      apr_temp_abs_srcdir="`cd \"$1\" && pwd`"

      apr_found="reconfig"

      apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"

      case $apr_bundled_major in

        "")

          AC_MSG_ERROR([failed to find major version of bundled APR])

        ;;

        0)

          apr_temp_apr_config_file="apr-config"

        ;;

        *)

          apr_temp_apr_config_file="apr-$apr_bundled_major-config"

        ;;

      esac

      if test -n "$2"; then

        apr_config="$2/$apr_temp_apr_config_file"

      else

        apr_config="$1/$apr_temp_apr_config_file"

      fi

    fi

  ])



  AC_MSG_RESULT($apr_found)

])

build/find_apu.m4

0 → 100644
+211 −0
Original line number Diff line number Diff line 
dnl -------------------------------------------------------- -*- autoconf -*-

dnl Licensed to the Apache Software Foundation (ASF) under one or more

dnl contributor license agreements.  See the NOTICE file distributed with

dnl this work for additional information regarding copyright ownership.

dnl The ASF licenses this file to You under the Apache License, Version 2.0

dnl (the "License"); you may not use this file except in compliance with

dnl the License.  You may obtain a copy of the License at

dnl

dnl     http://www.apache.org/licenses/LICENSE-2.0

dnl

dnl Unless required by applicable law or agreed to in writing, software

dnl distributed under the License is distributed on an "AS IS" BASIS,

dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

dnl See the License for the specific language governing permissions and

dnl limitations under the License.



dnl

dnl find_apu.m4 : locate the APR-util (APU) include files and libraries

dnl

dnl This macro file can be used by applications to find and use the APU

dnl library. It provides a standardized mechanism for using APU. It supports

dnl embedding APU into the application source, or locating an installed

dnl copy of APU.

dnl

dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,

dnl              detailed-check)

dnl

dnl   where srcdir is the location of the bundled APU source directory, or

dnl   empty if source is not bundled.

dnl

dnl   where builddir is the location where the bundled APU will be built,

dnl   or empty if the build will occur in the srcdir.

dnl

dnl   where implicit-install-check set to 1 indicates if there is no

dnl   --with-apr-util option specified, we will look for installed copies.

dnl

dnl   where acceptable-majors is a space separated list of acceptable major

dnl   version numbers. Often only a single major version will be acceptable.

dnl   If multiple versions are specified, and --with-apr-util=PREFIX or the

dnl   implicit installed search are used, then the first (leftmost) version

dnl   in the list that is found will be used.  Currently defaults to [0 1].

dnl

dnl   where detailed-check is an M4 macro which sets the apu_acceptable to

dnl   either "yes" or "no". The macro will be invoked for each installed

dnl   copy of APU found, with the apu_config variable set appropriately.

dnl   Only installed copies of APU which are considered acceptable by

dnl   this macro will be considered found. If no installed copies are

dnl   considered acceptable by this macro, apu_found will be set to either

dnl   either "no" or "reconfig".

dnl

dnl Sets the following variables on exit:

dnl

dnl   apu_found : "yes", "no", "reconfig"

dnl

dnl   apu_config : If the apu-config tool exists, this refers to it.  If

dnl                apu_found is "reconfig", then the bundled directory

dnl                should be reconfigured *before* using apu_config.

dnl

dnl Note: this macro file assumes that apr-config has been installed; it

dnl       is normally considered a required part of an APR installation.

dnl

dnl Note: At this time, we cannot find *both* a source dir and a build dir.

dnl       If both are available, the build directory should be passed to

dnl       the --with-apr-util switch.

dnl

dnl Note: the installation layout is presumed to follow the standard

dnl       PREFIX/lib and PREFIX/include pattern. If the APU config file

dnl       is available (and can be found), then non-standard layouts are

dnl       possible, since it will be described in the config file.

dnl

dnl If a bundled source directory is available and needs to be (re)configured,

dnl then apu_found is set to "reconfig". The caller should reconfigure the

dnl (passed-in) source directory, placing the result in the build directory,

dnl as appropriate.

dnl

dnl If apu_found is "yes" or "reconfig", then the caller should use the

dnl value of apu_config to fetch any necessary build/link information.

dnl



AC_DEFUN([APR_FIND_APU], [

  apu_found="no"



  if test "$target_os" = "os2-emx"; then

    # Scripts don't pass test -x on OS/2

    TEST_X="test -f"

  else

    TEST_X="test -x"

  fi



  ifelse([$4], [],

  [

    ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APU 0.x then APU 1.x]))

    acceptable_majors="0 1"

  ], [acceptable_majors="$4"])



  apu_temp_acceptable_apu_config=""

  for apu_temp_major in $acceptable_majors

  do

    case $apu_temp_major in

      0)

      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"

      ;;

      *)

      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"

      ;;

    esac

  done



  AC_MSG_CHECKING(for APR-util)

  AC_ARG_WITH(apr-util,

  [  --with-apr-util=PATH    prefix for installed APU or the full path to 

                             apu-config],

  [

    if test "$withval" = "no" || test "$withval" = "yes"; then

      AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])

    fi



    for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config

    do

      for lookdir in "$withval/bin" "$withval"

      do

        if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then

          apu_config="$lookdir/$apu_temp_apu_config_file"

          ifelse([$5], [], [], [

          apu_acceptable="yes"

          $5

          if test "$apu_acceptable" != "yes"; then

            AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])

            continue

          fi])

          apu_found="yes"

          break 2

        fi

      done

    done



    if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then

      apu_config="$withval"

      ifelse([$5], [], [apu_found="yes"], [

          apu_acceptable="yes"

          $5

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

                apu_found="yes"

          fi])

    fi



    dnl if --with-apr-util is used, it is a fatal error for its argument

    dnl to be invalid

    if test "$apu_found" != "yes"; then

      AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])

    fi

  ],[

    if test -n "$3" && test "$3" = "1"; then

      for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config

      do

        if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then

          apu_config="$apu_temp_apu_config_file" 

          ifelse([$5], [], [], [

          apu_acceptable="yes"

          $5

          if test "$apu_acceptable" != "yes"; then

            AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])

            continue

          fi])

          apu_found="yes"

          break

        else

          dnl look in some standard places (apparently not in builtin/default)

          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do

            if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then

              apu_config="$lookdir/bin/$apu_temp_apu_config_file"

              ifelse([$5], [], [], [

              apu_acceptable="yes"

              $5

              if test "$apu_acceptable" != "yes"; then

                AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])

                continue

              fi])

              apu_found="yes"

              break 2

            fi

          done

        fi

      done

    fi

    dnl if we have not found anything yet and have bundled source, use that

    if test "$apu_found" = "no" && test -d "$1"; then

      apu_temp_abs_srcdir="`cd \"$1\" && pwd`"

      apu_found="reconfig"

      apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"

      case $apu_bundled_major in

        "")

          AC_MSG_ERROR([failed to find major version of bundled APU])

        ;;

        0)

          apu_temp_apu_config_file="apu-config"

        ;;

        *)

          apu_temp_apu_config_file="apu-$apu_bundled_major-config"

        ;;

      esac

      if test -n "$2"; then

        apu_config="$2/$apu_temp_apu_config_file"

      else

        apu_config="$1/$apu_temp_apu_config_file"

      fi

    fi

  ])



  AC_MSG_RESULT($apu_found)

])