CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add --with-apr using the APR_FIND_APR macro from Apache.

Browse source
This commit is contained in:
david 2012-02-01 00:38:41 +00:00
parent 83f1d573c0
commit 899a1314d3
6 changed files with 452 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

203
acinclude.m4
View file

@ -103,3 +103,206 @@ AC_DEFUN([CHECK_IPV6_IPPROTO_RAW],
;;
esac
])
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)
])

159
configure vendored
View file

@ -607,7 +607,6 @@ NMAP_UPDATE_CLEAN
NMAP_UPDATE_UNINSTALL
NMAP_UPDATE_INSTALL
NMAP_UPDATE_BUILD
APR_CONFIG
NCAT_DIST_CLEAN
NCAT_CLEAN
NCAT_UNINSTALL
@ -766,6 +765,7 @@ with_libnbase
with_libnsock
with_ncat
with_nmap_update
with_apr
with_subversion
'
ac_precious_vars='build_alias
@ -1436,6 +1436,8 @@ Optional Packages:
--with-libnsock=DIR Compile and link to libnsock in DIR
--without-ncat Skip build and installation of Ncat
--without-nmap-update Skip build and installation of nmap-update
--with-apr=PATH prefix for installed APR or the full path to
apr-config
--with-subversion=DIR Look for libsvn1 in DIR/include and DIR/libs.
Some influential environment variables:
@ -7608,6 +7610,117 @@ fi
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
acceptable_majors="1"
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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5
$as_echo_n "checking for APR... " >&6; }
# Check whether --with-apr was given.
if test "${with_apr+set}" = set; then :
withval=$with_apr;
if test "$withval" = "no" || test "$withval" = "yes"; then
as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5
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"
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"
apr_found="yes"
fi
if test "$apr_found" != "yes"; then
as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
fi
else
if test -n "1" && test "1" = "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"
apr_found="yes"
break
else
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"
apr_found="yes"
break 2
fi
done
fi
done
fi
if test "$apr_found" = "no" && test -d ""; then
apr_temp_abs_srcdir="`cd \"\" && pwd`"
apr_found="reconfig"
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`"
case $apr_bundled_major in
"")
as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5
;;
0)
apr_temp_apr_config_file="apr-config"
;;
*)
apr_temp_apr_config_file="apr-$apr_bundled_major-config"
;;
esac
if test -n ""; then
apr_config="/$apr_temp_apr_config_file"
else
apr_config="/$apr_temp_apr_config_file"
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5
$as_echo "$apr_found" >&6; }
if test "$apr_found" = "no"; then
with_nmap_update=no
fi
# Check whether --with-subversion was given.
if test "${with_subversion+set}" = set; then :
withval=$with_subversion;
@ -7629,50 +7742,8 @@ fi
if test "$with_nmap_update" != "no"; then
have_libsvn=yes
if test "$have_libsvn" = "yes"; then
for ac_prog in apr-1-config
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_APR_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$APR_CONFIG"; then
ac_cv_prog_APR_CONFIG="$APR_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_APR_CONFIG="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
APR_CONFIG=$ac_cv_prog_APR_CONFIG
if test -n "$APR_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APR_CONFIG" >&5
$as_echo "$APR_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$APR_CONFIG" && break
done
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $($APR_CONFIG --cppflags --includes)"
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
ac_fn_c_check_header_mongrel "$LINENO" "svn_client.h" "ac_cv_header_svn_client_h" "$ac_includes_default"
if test "x$ac_cv_header_svn_client_h" = xyes; then :

8
configure.ac
View file

@ -858,6 +858,11 @@ AC_SUBST(NCAT_DIST_CLEAN)
AC_ARG_WITH([nmap-update],
AC_HELP_STRING([--without-nmap-update], [Skip build and installation of nmap-update]), [], [with_nmap_update=check])
APR_FIND_APR(, , 1, 1)
if test "$apr_found" = "no"; then
with_nmap_update=no
fi
AC_ARG_WITH(subversion,
AC_HELP_STRING([--with-subversion=DIR], [Look for libsvn1 in DIR/include and DIR/libs.]),
[
@ -877,9 +882,8 @@ case "$with_subversion" in
if test "$with_nmap_update" != "no"; then
have_libsvn=yes
if test "$have_libsvn" = "yes"; then
AC_CHECK_PROGS([APR_CONFIG], [apr-1-config])
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $($APR_CONFIG --cppflags --includes)"
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
AC_CHECK_HEADER([svn_client.h], [], [
AC_CHECK_HEADER([subversion-1/svn_client.h], [], [have_libsvn=no])
])

2
nmap-update/Makefile.in
View file

@ -18,8 +18,6 @@ SHTOOL = ../shtool
DESTDIR =
APR_CONFIG = @APR_CONFIG@
SOURCES = nmap-update svn_auth
C_FILES = $(addsuffix .c,$(SOURCES))
O_FILES = $(addsuffix .o,$(SOURCES))

155
nmap-update/configure vendored
View file

@ -604,7 +604,6 @@ LIBOBJS
EGREP
GREP
CPP
APR_CONFIG
STRIP
INSTALL_DATA
INSTALL_SCRIPT
@ -657,6 +656,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
with_apr
with_subversion
'
ac_precious_vars='build_alias
@ -1276,6 +1276,8 @@ if test -n "$ac_init_help"; then
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-apr=PATH prefix for installed APR or the full path to
apr-config
--with-subversion=DIR Look for libsvn1 in DIR/include and DIR/libs.
Some influential environment variables:
@ -2003,6 +2005,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
# Checks for programs.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@ -3014,48 +3027,119 @@ else
STRIP="$ac_cv_path_STRIP"
fi
for ac_prog in apr-1-config
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_APR_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$APR_CONFIG"; then
ac_cv_prog_APR_CONFIG="$APR_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_APR_CONFIG="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
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
done
acceptable_majors="1"
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
IFS=$as_save_IFS
fi
fi
APR_CONFIG=$ac_cv_prog_APR_CONFIG
if test -n "$APR_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APR_CONFIG" >&5
$as_echo "$APR_CONFIG" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5
$as_echo_n "checking for APR... " >&6; }
# Check whether --with-apr was given.
if test "${with_apr+set}" = set; then :
withval=$with_apr;
if test "$withval" = "no" || test "$withval" = "yes"; then
as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5
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"
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"
apr_found="yes"
fi
if test "$apr_found" != "yes"; then
as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test -n "1" && test "1" = "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"
apr_found="yes"
break
else
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"
apr_found="yes"
break 2
fi
done
fi
done
fi
if test "$apr_found" = "no" && test -d ""; then
apr_temp_abs_srcdir="`cd \"\" && pwd`"
apr_found="reconfig"
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`"
case $apr_bundled_major in
"")
as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5
;;
0)
apr_temp_apr_config_file="apr-config"
;;
*)
apr_temp_apr_config_file="apr-$apr_bundled_major-config"
;;
esac
if test -n ""; then
apr_config="/$apr_temp_apr_config_file"
else
apr_config="/$apr_temp_apr_config_file"
fi
fi
fi
test -n "$APR_CONFIG" && break
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5
$as_echo "$apr_found" >&6; }
if test "$apr_found" = "no"; then
as_fn_error $? "libapr is required to build nmap-update." "$LINENO" 5
fi
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
LIBS="$LIBS $($apr_config --link-ld)"
# Check whether --with-subversion was given.
@ -3215,7 +3299,6 @@ fi
# Checks for header files.
CPPFLAGS="$CPPFLAGS $($APR_CONFIG --cppflags --includes)"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

11
nmap-update/configure.ac
View file

@ -5,11 +5,19 @@ AC_PREREQ([2.68])
AC_INIT([nmap-update.c])
AC_CONFIG_HEADERS([config.h])
m4_include([../acinclude.m4])
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PATH_TOOL([STRIP], [strip], [/bin/true])
AC_CHECK_PROGS([APR_CONFIG], [apr-1-config])
APR_FIND_APR(, , 1, 1)
if test "$apr_found" = "no"; then
AC_MSG_ERROR([libapr is required to build nmap-update.])
fi
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
LIBS="$LIBS $($apr_config --link-ld)"
AC_ARG_WITH(subversion,
AC_HELP_STRING([--with-subversion=DIR], [Look for libsvn1 in DIR/include and DIR/libs.]),
@ -33,7 +41,6 @@ AC_CHECK_LIB([svn_subr-1], [svn_handle_error2])
AC_CHECK_LIB([apr-1], [apr_pool_destroy])
# Checks for header files.
CPPFLAGS="$CPPFLAGS $($APR_CONFIG --cppflags --includes)"
AC_CHECK_HEADERS([svn_client.h subversion-1/svn_client.h])
# Checks for typedefs, structures, and compiler characteristics.