mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
Revert r10484, which added checks for GTK+ and PyGTK in configure. The checks
failed if a user didn't have the development versions of those libraries installed; in particular, they tried to compile a GTK+ program and looked for pkg-config's .pc files. It is better to err on the side of building Zenmap when it may not be supported than not building it when it may in fact be supported (which was the previous behavior anyway). See discussion at http://seclists.org/nmap-dev/2008/q4/0054.html.
This commit is contained in:
david
355
aclocal.m4
vendored
355
aclocal.m4
vendored
@@ -11,361 +11,6 @@
|
|||||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
# PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
# Configure paths for GTK+
|
|
||||||
# Owen Taylor 1997-2001
|
|
||||||
|
|
||||||
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
||||||
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
|
|
||||||
dnl pass to pkg-config
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_GTK_2_0],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from pkg-config
|
|
||||||
dnl
|
|
||||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
|
|
||||||
, enable_gtktest=yes)
|
|
||||||
|
|
||||||
pkg_config_args=gtk+-2.0
|
|
||||||
for module in . $4
|
|
||||||
do
|
|
||||||
case "$module" in
|
|
||||||
gthread)
|
|
||||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
no_gtk=""
|
|
||||||
|
|
||||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** pkg-config too old; version 0.7 or better required."
|
|
||||||
no_gtk=yes
|
|
||||||
PKG_CONFIG=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
min_gtk_version=ifelse([$1], ,2.0.0,$1)
|
|
||||||
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
## don't try to run the test against uninstalled libtool libs
|
|
||||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
|
||||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$no_gtk" = x ; then
|
|
||||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
|
||||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
|
||||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
||||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
||||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
||||||
if test "x$enable_gtktest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$GTK_LIBS $LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
|
|
||||||
dnl checks the results of pkg-config to some extent)
|
|
||||||
dnl
|
|
||||||
rm -f conf.gtktest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
int major, minor, micro;
|
|
||||||
char *tmp_version;
|
|
||||||
|
|
||||||
system ("touch conf.gtktest");
|
|
||||||
|
|
||||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
||||||
tmp_version = g_strdup("$min_gtk_version");
|
|
||||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_gtk_version");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
|
||||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
|
||||||
(gtk_micro_version != $gtk_config_micro_version))
|
|
||||||
{
|
|
||||||
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
|
||||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf ("*** was found! If pkg-config was correct, then it is best\n");
|
|
||||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
|
||||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
||||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
||||||
printf("*** required on your system.\n");
|
|
||||||
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
|
||||||
printf("*** to point to the correct configuration files\n");
|
|
||||||
}
|
|
||||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
||||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
||||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
|
||||||
{
|
|
||||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
||||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
||||||
printf("*** library (version %d.%d.%d)\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((gtk_major_version > major) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
|
||||||
major, minor, micro);
|
|
||||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
|
||||||
printf("***\n");
|
|
||||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
||||||
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
|
|
||||||
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
|
|
||||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
||||||
printf("*** so that the correct libraries are found at run-time))\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_gtk" = x ; then
|
|
||||||
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
if test "$PKG_CONFIG" = "no" ; then
|
|
||||||
echo "*** A new enough version of pkg-config was not found."
|
|
||||||
echo "*** See http://pkgconfig.sourceforge.net"
|
|
||||||
else
|
|
||||||
if test -f conf.gtktest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run GTK+ test program, checking why..."
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$LIBS $GTK_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
|
||||||
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
|
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
GTK_CFLAGS=""
|
|
||||||
GTK_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
AC_SUBST(GTK_CFLAGS)
|
|
||||||
AC_SUBST(GTK_LIBS)
|
|
||||||
rm -f conf.gtktest
|
|
||||||
])
|
|
||||||
|
|
||||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
|
||||||
#
|
|
||||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but
|
|
||||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
|
||||||
# ----------------------------------
|
|
||||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
|
||||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
|
||||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
|
||||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
|
||||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
||||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
||||||
fi
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
|
||||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
PKG_CONFIG=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi[]dnl
|
|
||||||
])# PKG_PROG_PKG_CONFIG
|
|
||||||
|
|
||||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
|
||||||
#
|
|
||||||
# Check to see whether a particular set of modules exists. Similar
|
|
||||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
|
||||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
|
||||||
# PKG_CHECK_EXISTS manually
|
|
||||||
# --------------------------------------------------------------
|
|
||||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
|
||||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
|
||||||
m4_ifval([$2], [$2], [:])
|
|
||||||
m4_ifvaln([$3], [else
|
|
||||||
$3])dnl
|
|
||||||
fi])
|
|
||||||
|
|
||||||
|
|
||||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
|
||||||
# ---------------------------------------------
|
|
||||||
m4_define([_PKG_CONFIG],
|
|
||||||
[if test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$$1"; then
|
|
||||||
pkg_cv_[]$1="$$1"
|
|
||||||
else
|
|
||||||
PKG_CHECK_EXISTS([$3],
|
|
||||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
|
||||||
[pkg_failed=yes])
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi[]dnl
|
|
||||||
])# _PKG_CONFIG
|
|
||||||
|
|
||||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
# -----------------------------
|
|
||||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
|
||||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi[]dnl
|
|
||||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
|
|
||||||
|
|
||||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
|
||||||
# [ACTION-IF-NOT-FOUND])
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Note that if there is a possibility the first call to
|
|
||||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
|
||||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# --------------------------------------------------------------
|
|
||||||
AC_DEFUN([PKG_CHECK_MODULES],
|
|
||||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
|
||||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
|
||||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
AC_MSG_CHECKING([for $1])
|
|
||||||
|
|
||||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
|
||||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
|
||||||
|
|
||||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
|
||||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details.])
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
_PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
|
||||||
else
|
|
||||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
|
||||||
|
|
||||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
|
||||||
[Package requirements ($2) were not met:
|
|
||||||
|
|
||||||
$$1_PKG_ERRORS
|
|
||||||
|
|
||||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
||||||
installed software in a non-standard prefix.
|
|
||||||
|
|
||||||
_PKG_TEXT
|
|
||||||
])],
|
|
||||||
[AC_MSG_RESULT([no])
|
|
||||||
$4])
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
|
||||||
[The pkg-config script could not be found or is too old. Make sure it
|
|
||||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
||||||
path to pkg-config.
|
|
||||||
|
|
||||||
_PKG_TEXT
|
|
||||||
|
|
||||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
|
||||||
[$4])
|
|
||||||
else
|
|
||||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
|
||||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi[]dnl
|
|
||||||
])# PKG_CHECK_MODULES
|
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||||
# Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
|
|||||||
489
configure
vendored
489
configure
vendored
@@ -693,9 +693,6 @@ BUILDNDIFF
|
|||||||
INSTALLNDIFF
|
INSTALLNDIFF
|
||||||
NDIFF_CLEAN
|
NDIFF_CLEAN
|
||||||
NDIFF_DIST_CLEAN
|
NDIFF_DIST_CLEAN
|
||||||
PKG_CONFIG
|
|
||||||
GTK_CFLAGS
|
|
||||||
GTK_LIBS
|
|
||||||
BUILDZENMAP
|
BUILDZENMAP
|
||||||
INSTALLZENMAP
|
INSTALLZENMAP
|
||||||
UNINSTALLZENMAP
|
UNINSTALLZENMAP
|
||||||
@@ -753,8 +750,7 @@ CPPFLAGS
|
|||||||
CXX
|
CXX
|
||||||
CXXFLAGS
|
CXXFLAGS
|
||||||
CCC
|
CCC
|
||||||
CPP
|
CPP'
|
||||||
PKG_CONFIG'
|
|
||||||
ac_subdirs_all='libpcap
|
ac_subdirs_all='libpcap
|
||||||
libpcre
|
libpcre
|
||||||
libdnet-stripped
|
libdnet-stripped
|
||||||
@@ -1329,11 +1325,6 @@ if test -n "$ac_init_help"; then
|
|||||||
|
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
Optional Features:
|
|
||||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
|
||||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
|
||||||
--disable-gtktest do not try to compile and run a test GTK+ program
|
|
||||||
|
|
||||||
Optional Packages:
|
Optional Packages:
|
||||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||||
@@ -1371,7 +1362,6 @@ Some influential environment variables:
|
|||||||
CXX C++ compiler command
|
CXX C++ compiler command
|
||||||
CXXFLAGS C++ compiler flags
|
CXXFLAGS C++ compiler flags
|
||||||
CPP C preprocessor
|
CPP C preprocessor
|
||||||
PKG_CONFIG path to pkg-config utility
|
|
||||||
|
|
||||||
Use these variables to override the choices made by `configure' or to help
|
Use these variables to override the choices made by `configure' or to help
|
||||||
it to find libraries and programs with nonstandard names/locations.
|
it to find libraries and programs with nonstandard names/locations.
|
||||||
@@ -6122,472 +6112,6 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test "$with_zenmap" != "no"; then
|
|
||||||
# Check whether --enable-gtktest was given.
|
|
||||||
if test "${enable_gtktest+set}" = set; then
|
|
||||||
enableval=$enable_gtktest;
|
|
||||||
else
|
|
||||||
enable_gtktest=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
pkg_config_args=gtk+-2.0
|
|
||||||
for module in .
|
|
||||||
do
|
|
||||||
case "$module" in
|
|
||||||
gthread)
|
|
||||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
no_gtk=""
|
|
||||||
|
|
||||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
||||||
set dummy pkg-config; ac_word=$2
|
|
||||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
case $PKG_CONFIG in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
||||||
echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
||||||
else
|
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** pkg-config too old; version 0.7 or better required."
|
|
||||||
no_gtk=yes
|
|
||||||
PKG_CONFIG=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
min_gtk_version=2.8.0
|
|
||||||
{ echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
|
|
||||||
echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
## don't try to run the test against uninstalled libtool libs
|
|
||||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
|
||||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$no_gtk" = x ; then
|
|
||||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
|
||||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
|
||||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
|
||||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
|
||||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
|
||||||
if test "x$enable_gtktest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$GTK_LIBS $LIBS"
|
|
||||||
rm -f conf.gtktest
|
|
||||||
if test "$cross_compiling" = yes; then
|
|
||||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
int major, minor, micro;
|
|
||||||
char *tmp_version;
|
|
||||||
|
|
||||||
system ("touch conf.gtktest");
|
|
||||||
|
|
||||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
||||||
tmp_version = g_strdup("$min_gtk_version");
|
|
||||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_gtk_version");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
|
||||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
|
||||||
(gtk_micro_version != $gtk_config_micro_version))
|
|
||||||
{
|
|
||||||
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
|
||||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf ("*** was found! If pkg-config was correct, then it is best\n");
|
|
||||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
|
||||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
||||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
||||||
printf("*** required on your system.\n");
|
|
||||||
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
|
||||||
printf("*** to point to the correct configuration files\n");
|
|
||||||
}
|
|
||||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
||||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
||||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
|
||||||
{
|
|
||||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
||||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
||||||
printf("*** library (version %d.%d.%d)\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((gtk_major_version > major) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
|
||||||
major, minor, micro);
|
|
||||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
|
||||||
printf("***\n");
|
|
||||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
||||||
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
|
|
||||||
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
|
|
||||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
||||||
printf("*** so that the correct libraries are found at run-time))\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest$ac_exeext
|
|
||||||
if { (ac_try="$ac_link"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_link") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
||||||
{ (case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_try") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; }; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "$as_me: program exited with status $ac_status" >&5
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
( exit $ac_status )
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_gtk" = x ; then
|
|
||||||
{ echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
|
|
||||||
echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
|
|
||||||
:
|
|
||||||
else
|
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6; }
|
|
||||||
if test "$PKG_CONFIG" = "no" ; then
|
|
||||||
echo "*** A new enough version of pkg-config was not found."
|
|
||||||
echo "*** See http://pkgconfig.sourceforge.net"
|
|
||||||
else
|
|
||||||
if test -f conf.gtktest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run GTK+ test program, checking why..."
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$LIBS $GTK_LIBS"
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { (ac_try="$ac_link"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_link") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_c_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest$ac_exeext &&
|
|
||||||
$as_test_x conftest$ac_exeext; then
|
|
||||||
echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
|
||||||
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
GTK_CFLAGS=""
|
|
||||||
GTK_LIBS=""
|
|
||||||
if test "$with_zenmap" = "check"; then
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: Not building Zenmap because GTK+ 2.8.0 or later was not found" >&5
|
|
||||||
echo "$as_me: WARNING: Not building Zenmap because GTK+ 2.8.0 or later was not found" >&2;}
|
|
||||||
else
|
|
||||||
{ { echo "$as_me:$LINENO: error: --with-zenmap requires GTK+ 2.8.0 or later
|
|
||||||
See \`config.log' for more details." >&5
|
|
||||||
echo "$as_me: error: --with-zenmap requires GTK+ 2.8.0 or later
|
|
||||||
See \`config.log' for more details." >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
with_zenmap=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
rm -f conf.gtktest
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test "$with_zenmap" != "no"; then
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
|
||||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
case $PKG_CONFIG in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
||||||
echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
||||||
else
|
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
|
||||||
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
|
||||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
||||||
set dummy pkg-config; ac_word=$2
|
|
||||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
case $ac_pt_PKG_CONFIG in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
|
||||||
if test -n "$ac_pt_PKG_CONFIG"; then
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
|
||||||
echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
|
|
||||||
else
|
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_pt_PKG_CONFIG" = x; then
|
|
||||||
PKG_CONFIG=""
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
||||||
whose name does not start with the host triplet. If you think this
|
|
||||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
||||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
||||||
whose name does not start with the host triplet. If you think this
|
|
||||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
_pkg_min_version=0.9.0
|
|
||||||
{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
|
||||||
echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
|
||||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
|
||||||
echo "${ECHO_T}yes" >&6; }
|
|
||||||
else
|
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6; }
|
|
||||||
PKG_CONFIG=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.8.0\"") >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.8.0") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
if test "$with_zenmap" = "check"; then
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: Not building Zenmap because PyGTK 2.8.0 or later was not found" >&5
|
|
||||||
echo "$as_me: WARNING: Not building Zenmap because PyGTK 2.8.0 or later was not found" >&2;}
|
|
||||||
else
|
|
||||||
{ { echo "$as_me:$LINENO: error: --with-zenmap requires PyGTK 2.8.0 or later
|
|
||||||
See \`config.log' for more details." >&5
|
|
||||||
echo "$as_me: error: --with-zenmap requires PyGTK 2.8.0 or later
|
|
||||||
See \`config.log' for more details." >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
with_zenmap=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "$with_zenmap" = "no"; then
|
if test "$with_zenmap" = "no"; then
|
||||||
BUILDZENMAP=""
|
BUILDZENMAP=""
|
||||||
@@ -10120,9 +9644,6 @@ BUILDNDIFF!$BUILDNDIFF$ac_delim
|
|||||||
INSTALLNDIFF!$INSTALLNDIFF$ac_delim
|
INSTALLNDIFF!$INSTALLNDIFF$ac_delim
|
||||||
NDIFF_CLEAN!$NDIFF_CLEAN$ac_delim
|
NDIFF_CLEAN!$NDIFF_CLEAN$ac_delim
|
||||||
NDIFF_DIST_CLEAN!$NDIFF_DIST_CLEAN$ac_delim
|
NDIFF_DIST_CLEAN!$NDIFF_DIST_CLEAN$ac_delim
|
||||||
PKG_CONFIG!$PKG_CONFIG$ac_delim
|
|
||||||
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
|
|
||||||
GTK_LIBS!$GTK_LIBS$ac_delim
|
|
||||||
BUILDZENMAP!$BUILDZENMAP$ac_delim
|
BUILDZENMAP!$BUILDZENMAP$ac_delim
|
||||||
INSTALLZENMAP!$INSTALLZENMAP$ac_delim
|
INSTALLZENMAP!$INSTALLZENMAP$ac_delim
|
||||||
UNINSTALLZENMAP!$UNINSTALLZENMAP$ac_delim
|
UNINSTALLZENMAP!$UNINSTALLZENMAP$ac_delim
|
||||||
@@ -10137,6 +9658,9 @@ LIBPCAP_LIBS!$LIBPCAP_LIBS$ac_delim
|
|||||||
subdirs!$subdirs$ac_delim
|
subdirs!$subdirs$ac_delim
|
||||||
LIBPCRE_LIBS!$LIBPCRE_LIBS$ac_delim
|
LIBPCRE_LIBS!$LIBPCRE_LIBS$ac_delim
|
||||||
LIBPCREDIR!$LIBPCREDIR$ac_delim
|
LIBPCREDIR!$LIBPCREDIR$ac_delim
|
||||||
|
PCRE_DEPENDS!$PCRE_DEPENDS$ac_delim
|
||||||
|
PCRE_BUILD!$PCRE_BUILD$ac_delim
|
||||||
|
PCRE_CLEAN!$PCRE_CLEAN$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||||
@@ -10178,9 +9702,6 @@ _ACEOF
|
|||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
PCRE_DEPENDS!$PCRE_DEPENDS$ac_delim
|
|
||||||
PCRE_BUILD!$PCRE_BUILD$ac_delim
|
|
||||||
PCRE_CLEAN!$PCRE_CLEAN$ac_delim
|
|
||||||
PCRE_DIST_CLEAN!$PCRE_DIST_CLEAN$ac_delim
|
PCRE_DIST_CLEAN!$PCRE_DIST_CLEAN$ac_delim
|
||||||
LIBDNET_LIBS!$LIBDNET_LIBS$ac_delim
|
LIBDNET_LIBS!$LIBDNET_LIBS$ac_delim
|
||||||
LIBDNETDIR!$LIBDNETDIR$ac_delim
|
LIBDNETDIR!$LIBDNETDIR$ac_delim
|
||||||
@@ -10211,7 +9732,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
|
||||||
break
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||||
|
|||||||
18
configure.ac
18
configure.ac
@@ -237,24 +237,6 @@ if test "$with_zenmap" != "no"; then
|
|||||||
AC_MSG_FAILURE([--with-zenmap requires Python 2.4 or later])
|
AC_MSG_FAILURE([--with-zenmap requires Python 2.4 or later])
|
||||||
fi
|
fi
|
||||||
with_zenmap=no])
|
with_zenmap=no])
|
||||||
if test "$with_zenmap" != "no"; then
|
|
||||||
AM_PATH_GTK_2_0([2.8.0], [],
|
|
||||||
[if test "$with_zenmap" = "check"; then
|
|
||||||
AC_MSG_WARN([Not building Zenmap because GTK+ 2.8.0 or later was not found])
|
|
||||||
else
|
|
||||||
AC_MSG_FAILURE([--with-zenmap requires GTK+ 2.8.0 or later])
|
|
||||||
fi
|
|
||||||
with_zenmap=no])
|
|
||||||
fi
|
|
||||||
if test "$with_zenmap" != "no"; then
|
|
||||||
PKG_CHECK_EXISTS([pygtk-2.0 >= 2.8.0], [],
|
|
||||||
[if test "$with_zenmap" = "check"; then
|
|
||||||
AC_MSG_WARN([Not building Zenmap because PyGTK 2.8.0 or later was not found])
|
|
||||||
else
|
|
||||||
AC_MSG_FAILURE([--with-zenmap requires PyGTK 2.8.0 or later])
|
|
||||||
fi
|
|
||||||
with_zenmap=no])
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "$with_zenmap" = "no"; then
|
if test "$with_zenmap" = "no"; then
|
||||||
BUILDZENMAP=""
|
BUILDZENMAP=""
|
||||||
|
|||||||
Reference in New Issue
Block a user