- implemented GTK2+ detection for wxGTK (patch by Guillem Jover <guillem@debian.org>)
- selection of required wx libraries to link only works with version 2.6.x
This commit is contained in:
Volker Ruppert
parent
96a47a4055
commit
7997876711
164
bochs/aclocal.m4
vendored
164
bochs/aclocal.m4
vendored
@ -1,5 +1,5 @@
|
||||
#####################################################################
|
||||
# $Id: aclocal.m4,v 1.6 2005-06-23 18:39:46 vruppert Exp $
|
||||
# $Id: aclocal.m4,v 1.7 2006-03-13 17:17:38 vruppert Exp $
|
||||
#####################################################################
|
||||
|
||||
dnl -------------------------------------------------------------------
|
||||
@ -70,8 +70,9 @@ dnl ----------end of largefile test------------------------------------
|
||||
|
||||
###########################################################################
|
||||
# The rest of this file is basically the concatenation of libtool.m4 and
|
||||
# ltdl.m4 from the libtool 1.4.2 package. However, to work around a missing
|
||||
# AM_CONDITIONAL macro, Bryce made the following change:
|
||||
# ltdl.m4 from the libtool 1.4.2 package. Also pkg.m4 from the pkg-config
|
||||
# 0.20 package. However, to work around a missing AM_CONDITIONAL macro,
|
||||
# Bryce made the following change:
|
||||
#
|
||||
# Change these lines
|
||||
# AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
|
||||
@ -6474,3 +6475,160 @@ AC_CHECK_TYPES([error_t],
|
||||
|
||||
AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
|
||||
])# AC_LTDL_FUNC_ARGZ
|
||||
|
||||
# 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
|
||||
])],
|
||||
[$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
|
||||
|
||||
448
bochs/configure
vendored
448
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.315 2006/03/12 15:11:52 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.316 2006/03/13 17:17:38 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -464,7 +464,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX SET_MAKE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BX_USE_NEW_PIT BX_USE_IDLE_HACK DEFINE_PLUGIN_PATH NONPLUGIN_GUI_LINK_OPTS OBJS64 IOAPIC_OBJS APIC_OBJS BX_COMPRESSED_HD_SUPPORT NE2K_OBJS PCI_OBJ KERNELDIR LSMOD INSMOD RMMOD DEPMOD PCIDEV_MODULE_MAKE_ALL KERNEL_MODULE_SUFFIX NETLOW_OBJS SUFFIX_LINE CPP_SUFFIX DEBUGGER_VAR BX_EXTERNAL_DEBUGGER BX_MAGIC_BREAKPOINT DISASM_VAR READLINE_LIB INSTRUMENT_DIR INSTRUMENT_VAR FPU_VAR FPU_GLUE_OBJ CDROM_OBJS SB16_OBJS SOUNDLOW_OBJS GAME_OBJS GDBSTUB_VAR IODEBUG_OBJS DOCBOOK2HTML BUILD_DOCBOOK_VAR INSTALL_DOCBOOK_VAR IODEV_LIB_VAR EXTRA_BX_OBJS NONINLINE_VAR INLINE_VAR EXTERNAL_DEPENDENCY EXT_DEBUG_OBJS RC_CMD WX_CONFIG XPM_LIB GUI_CFLAGS GUI_CXXFLAGS WX_CFLAGS WX_CXXFLAGS WGET DIALOG_OBJS EXPORT_DYNAMIC PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS INSTALL_TARGET INSTALL_LIST_FOR_PLATFORM RFB_LIBS GUI_OBJS DEVICE_LINK_OPTS GUI_LINK_OPTS GUI_LINK_OPTS_TERM GUI_LINK_OPTS_WX BXIMAGE_LINK_OPTS DASH SLASH CXXFP CFP OFP MAKELIB RMCOMMAND LINK LINK_CONSOLE EXE PRIMARY_TARGET PLUGIN_LIBNAME_TRANSFORMATION COMMAND_SEPARATOR CD_UP_ONE CD_UP_TWO CD_UP_THREE VERSION VER_STRING REL_STRING EXTRA_LINK_OPTS GUI_NON_PLUGIN_OBJS GUI_PLUGIN_OBJS IODEV_NON_PLUGIN_OBJS IODEV_PLUGIN_OBJS PLUGIN_VAR PLUGIN_TARGET INSTALL_PLUGINS_VAR GZIP TAR LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX SET_MAKE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BX_USE_NEW_PIT BX_USE_IDLE_HACK DEFINE_PLUGIN_PATH NONPLUGIN_GUI_LINK_OPTS OBJS64 IOAPIC_OBJS APIC_OBJS BX_COMPRESSED_HD_SUPPORT NE2K_OBJS PCI_OBJ KERNELDIR LSMOD INSMOD RMMOD DEPMOD PCIDEV_MODULE_MAKE_ALL KERNEL_MODULE_SUFFIX NETLOW_OBJS SUFFIX_LINE CPP_SUFFIX DEBUGGER_VAR BX_EXTERNAL_DEBUGGER BX_MAGIC_BREAKPOINT DISASM_VAR READLINE_LIB INSTRUMENT_DIR INSTRUMENT_VAR FPU_VAR FPU_GLUE_OBJ CDROM_OBJS SB16_OBJS SOUNDLOW_OBJS GAME_OBJS GDBSTUB_VAR IODEBUG_OBJS DOCBOOK2HTML BUILD_DOCBOOK_VAR INSTALL_DOCBOOK_VAR IODEV_LIB_VAR EXTRA_BX_OBJS NONINLINE_VAR INLINE_VAR EXTERNAL_DEPENDENCY EXT_DEBUG_OBJS RC_CMD WX_CONFIG XPM_LIB PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS GUI_CFLAGS GUI_CXXFLAGS WX_CFLAGS WX_CXXFLAGS WGET DIALOG_OBJS EXPORT_DYNAMIC PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS INSTALL_TARGET INSTALL_LIST_FOR_PLATFORM RFB_LIBS GUI_OBJS DEVICE_LINK_OPTS GUI_LINK_OPTS GUI_LINK_OPTS_TERM GUI_LINK_OPTS_WX BXIMAGE_LINK_OPTS DASH SLASH CXXFP CFP OFP MAKELIB RMCOMMAND LINK LINK_CONSOLE EXE PRIMARY_TARGET PLUGIN_LIBNAME_TRANSFORMATION COMMAND_SEPARATOR CD_UP_ONE CD_UP_TWO CD_UP_THREE VERSION VER_STRING REL_STRING EXTRA_LINK_OPTS GUI_NON_PLUGIN_OBJS GUI_PLUGIN_OBJS IODEV_NON_PLUGIN_OBJS IODEV_PLUGIN_OBJS PLUGIN_VAR PLUGIN_TARGET INSTALL_PLUGINS_VAR GZIP TAR LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -945,6 +945,18 @@ ac_env_FFLAGS_set=${FFLAGS+set}
|
||||
ac_env_FFLAGS_value=$FFLAGS
|
||||
ac_cv_env_FFLAGS_set=${FFLAGS+set}
|
||||
ac_cv_env_FFLAGS_value=$FFLAGS
|
||||
ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
|
||||
ac_env_PKG_CONFIG_value=$PKG_CONFIG
|
||||
ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
|
||||
ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
|
||||
ac_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}
|
||||
ac_env_GTK_CFLAGS_value=$GTK_CFLAGS
|
||||
ac_cv_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}
|
||||
ac_cv_env_GTK_CFLAGS_value=$GTK_CFLAGS
|
||||
ac_env_GTK_LIBS_set=${GTK_LIBS+set}
|
||||
ac_env_GTK_LIBS_value=$GTK_LIBS
|
||||
ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set}
|
||||
ac_cv_env_GTK_LIBS_value=$GTK_LIBS
|
||||
|
||||
#
|
||||
# Report the --help message.
|
||||
@ -1127,6 +1139,9 @@ Some influential environment variables:
|
||||
CXXCPP C++ preprocessor
|
||||
F77 Fortran 77 compiler command
|
||||
FFLAGS Fortran 77 compiler flags
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
|
||||
GTK_LIBS linker flags for GTK, overriding pkg-config
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@ -3663,7 +3678,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3666 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3681 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4771,7 +4786,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:4774:" \
|
||||
echo "$as_me:4789:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -5809,11 +5824,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:5812: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:5827: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:5816: \$? = $ac_status" >&5
|
||||
echo "$as_me:5831: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -6042,11 +6057,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6045: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6060: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6049: \$? = $ac_status" >&5
|
||||
echo "$as_me:6064: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -6109,11 +6124,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6112: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6127: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6116: \$? = $ac_status" >&5
|
||||
echo "$as_me:6131: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -8275,7 +8290,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8278 "configure"
|
||||
#line 8293 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8373,7 +8388,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8376 "configure"
|
||||
#line 8391 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10552,11 +10567,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:10555: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10570: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:10559: \$? = $ac_status" >&5
|
||||
echo "$as_me:10574: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -10619,11 +10634,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:10622: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10637: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:10626: \$? = $ac_status" >&5
|
||||
echo "$as_me:10641: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -11962,7 +11977,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11965 "configure"
|
||||
#line 11980 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12060,7 +12075,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12063 "configure"
|
||||
#line 12078 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12883,11 +12898,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12886: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12901: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12890: \$? = $ac_status" >&5
|
||||
echo "$as_me:12905: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -12950,11 +12965,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12953: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12968: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12957: \$? = $ac_status" >&5
|
||||
echo "$as_me:12972: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14966,11 +14981,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14969: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14973: \$? = $ac_status" >&5
|
||||
echo "$as_me:14988: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15199,11 +15214,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15202: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15217: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15206: \$? = $ac_status" >&5
|
||||
echo "$as_me:15221: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15266,11 +15281,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15269: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15284: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15273: \$? = $ac_status" >&5
|
||||
echo "$as_me:15288: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -17432,7 +17447,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17435 "configure"
|
||||
#line 17450 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17530,7 +17545,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17533 "configure"
|
||||
#line 17548 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19849,7 +19864,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19852 "configure"
|
||||
#line 19867 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -36708,6 +36723,7 @@ echo "$as_me:$LINENO: result: $WX_CONFIG" >&5
|
||||
echo "${ECHO_T}$WX_CONFIG" >&6
|
||||
|
||||
ok_wx_version=0
|
||||
wx_multi_lib=0
|
||||
wx_needs_gtk2=0
|
||||
echo "$as_me:$LINENO: checking for wxWidgets library version" >&5
|
||||
echo $ECHO_N "checking for wxWidgets library version... $ECHO_C" >&6
|
||||
@ -36723,9 +36739,11 @@ if test x$WX_CONFIG != xnot_found; then
|
||||
x2.[4-5]*) ok_wx_version=1 ;; # version 2.4 / 2.5
|
||||
x2.[6-9]*) # version 2.6 or greater
|
||||
ok_wx_version=1
|
||||
if test "$WX_BASENAME" = "wx_gtk2"; then
|
||||
wx_needs_gtk2=1
|
||||
fi
|
||||
wx_multi_lib=1
|
||||
case x$WX_BASENAME in
|
||||
xwx_gtk2|xwx_gtk2u) wx_needs_gtk2=1 ;;
|
||||
*) ;;
|
||||
esac
|
||||
;;
|
||||
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
|
||||
*) ;; # who knows?
|
||||
@ -36969,8 +36987,9 @@ _ACEOF
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)"
|
||||
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
||||
# the files in gui/*.cc.
|
||||
GUI_CFLAGS="$GUI_CFLAGS \`sdl-config --cflags\`"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS \`sdl-config --cflags\`"
|
||||
SDL_CFLAGS=`sdl-config --cflags`
|
||||
GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
|
||||
if test "$with_win32" != yes -a "$with_wx" != yes; then
|
||||
case $target in
|
||||
@ -37101,163 +37120,240 @@ _ACEOF
|
||||
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_WX)"
|
||||
SPECIFIC_GUI_SUPPORT_OBJS="$SPECIFIC_GUI_SUPPORT_OBJS \$(GUI_OBJS_WX_SUPPORT)"
|
||||
WX_CFLAGS="\`$WX_CONFIG --cflags\`"
|
||||
WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
|
||||
GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs core,base\`"
|
||||
if test "$wx_needs_gtk2" = 1; then
|
||||
# this hack might not work with all GTK 2 installations
|
||||
if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h" >&5
|
||||
echo $ECHO_N "checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&6
|
||||
else
|
||||
# Is the header compilable?
|
||||
echo "$as_me:$LINENO: checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h usability" >&5
|
||||
echo $ECHO_N "checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h usability... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include </opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6
|
||||
|
||||
# Is the header present?
|
||||
echo "$as_me:$LINENO: checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h presence" >&5
|
||||
echo $ECHO_N "checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h presence... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include </opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||||
WX_CFLAGS="`$WX_CONFIG --cflags`"
|
||||
WX_CXXFLAGS="`$WX_CONFIG --cxxflags`"
|
||||
if test "$wx_multi_lib" = 1; then
|
||||
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs core,base`"
|
||||
else
|
||||
ac_cpp_err=
|
||||
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs`"
|
||||
fi
|
||||
else
|
||||
ac_cpp_err=yes
|
||||
fi
|
||||
if test -z "$ac_cpp_err"; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
if test "$wx_needs_gtk2" = 1; then
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the compiler's result" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: see the Autoconf documentation" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: see the Autoconf documentation" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: in the future, the compiler will take precedence" >&5
|
||||
echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: in the future, the compiler will take precedence" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ------------------------------------------ ##
|
||||
## Report this to the AC_PACKAGE_NAME lists. ##
|
||||
## ------------------------------------------ ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
esac
|
||||
echo "$as_me:$LINENO: checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h" >&5
|
||||
echo $ECHO_N "checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; 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
|
||||
ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h=$ac_header_preproc
|
||||
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 $as_executable_p "$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
|
||||
|
||||
;;
|
||||
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
|
||||
echo "$as_me:$LINENO: result: $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&6
|
||||
|
||||
fi
|
||||
if test $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h = yes; then
|
||||
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 $as_executable_p "$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
|
||||
|
||||
WX_CFLAGS="$WX_CFLAGS -I/opt/gnome/include/gtk-2.0"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS -I/opt/gnome/include/gtk-2.0"
|
||||
;;
|
||||
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
|
||||
|
||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||
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
|
||||
|
||||
pkg_failed=no
|
||||
echo "$as_me:$LINENO: checking for GTK" >&5
|
||||
echo $ECHO_N "checking for GTK... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$GTK_CFLAGS"; then
|
||||
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$GTK_LIBS"; then
|
||||
pkg_cv_GTK_LIBS="$GTK_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
|
||||
else
|
||||
GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$GTK_PKG_ERRORS" >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:
|
||||
|
||||
$GTK_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables GTK_CFLAGS
|
||||
and GTK_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
echo "$as_me: error: Package requirements (gtk+-2.0) were not met:
|
||||
|
||||
$GTK_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables GTK_CFLAGS
|
||||
and GTK_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test $pkg_failed = untried; then
|
||||
{ { echo "$as_me:$LINENO: error: 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.
|
||||
|
||||
Alternatively, you may set the environment variables GTK_CFLAGS
|
||||
and GTK_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: 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.
|
||||
|
||||
Alternatively, you may set the environment variables GTK_CFLAGS
|
||||
and GTK_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
|
||||
GTK_LIBS=$pkg_cv_GTK_LIBS
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
|
||||
WX_CFLAGS="$WX_CFLAGS $GTK_CFLAGS"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS $GTK_CFLAGS"
|
||||
|
||||
fi
|
||||
else
|
||||
# if gtk-config exists, then add it to the cflags.
|
||||
gtkconf=`gtk-config --cflags`
|
||||
if test $? = 0; then
|
||||
# gtk-config was found and returned 0, so it must return valid output
|
||||
WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
|
||||
WX_CFLAGS="$WX_CFLAGS $gtkconf"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS $gtkconf"
|
||||
fi
|
||||
fi
|
||||
# GUI_C*FLAGS are added to the compilation of every bochs file, not just
|
||||
@ -40012,6 +40108,10 @@ s,@EXT_DEBUG_OBJS@,$EXT_DEBUG_OBJS,;t t
|
||||
s,@RC_CMD@,$RC_CMD,;t t
|
||||
s,@WX_CONFIG@,$WX_CONFIG,;t t
|
||||
s,@XPM_LIB@,$XPM_LIB,;t t
|
||||
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
|
||||
s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
|
||||
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
|
||||
s,@GTK_LIBS@,$GTK_LIBS,;t t
|
||||
s,@GUI_CFLAGS@,$GUI_CFLAGS,;t t
|
||||
s,@GUI_CXXFLAGS@,$GUI_CXXFLAGS,;t t
|
||||
s,@WX_CFLAGS@,$WX_CFLAGS,;t t
|
||||
|
||||
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.315 2006-03-12 15:11:52 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.316 2006-03-13 17:17:38 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -1990,6 +1990,7 @@ AC_MSG_CHECKING(for wxWidgets configuration script)
|
||||
AC_MSG_RESULT($WX_CONFIG)
|
||||
|
||||
ok_wx_version=0
|
||||
wx_multi_lib=0
|
||||
wx_needs_gtk2=0
|
||||
AC_MSG_CHECKING(for wxWidgets library version)
|
||||
if test x$WX_CONFIG != xnot_found; then
|
||||
@ -2004,9 +2005,11 @@ if test x$WX_CONFIG != xnot_found; then
|
||||
x2.[4-5]*) ok_wx_version=1 ;; # version 2.4 / 2.5
|
||||
x2.[6-9]*) # version 2.6 or greater
|
||||
ok_wx_version=1
|
||||
if test "$WX_BASENAME" = "wx_gtk2"; then
|
||||
wx_needs_gtk2=1
|
||||
fi
|
||||
wx_multi_lib=1
|
||||
case x$WX_BASENAME in
|
||||
xwx_gtk2|xwx_gtk2u) wx_needs_gtk2=1 ;;
|
||||
*) ;;
|
||||
esac
|
||||
;;
|
||||
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
|
||||
*) ;; # who knows?
|
||||
@ -2086,8 +2089,9 @@ if test "$with_sdl" = yes; then
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)"
|
||||
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
||||
# the files in gui/*.cc.
|
||||
GUI_CFLAGS="$GUI_CFLAGS \`sdl-config --cflags\`"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS \`sdl-config --cflags\`"
|
||||
SDL_CFLAGS=`sdl-config --cflags`
|
||||
GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
|
||||
if test "$with_win32" != yes -a "$with_wx" != yes; then
|
||||
case $target in
|
||||
@ -2194,22 +2198,25 @@ if test "$with_wx" = yes; then
|
||||
AC_DEFINE(BX_WITH_WX, 1)
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_WX)"
|
||||
SPECIFIC_GUI_SUPPORT_OBJS="$SPECIFIC_GUI_SUPPORT_OBJS \$(GUI_OBJS_WX_SUPPORT)"
|
||||
WX_CFLAGS="\`$WX_CONFIG --cflags\`"
|
||||
WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
|
||||
GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs core,base\`"
|
||||
WX_CFLAGS="`$WX_CONFIG --cflags`"
|
||||
WX_CXXFLAGS="`$WX_CONFIG --cxxflags`"
|
||||
if test "$wx_multi_lib" = 1; then
|
||||
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs core,base`"
|
||||
else
|
||||
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs`"
|
||||
fi
|
||||
if test "$wx_needs_gtk2" = 1; then
|
||||
# this hack might not work with all GTK 2 installations
|
||||
AC_CHECK_HEADER(/opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h, [
|
||||
WX_CFLAGS="$WX_CFLAGS -I/opt/gnome/include/gtk-2.0"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS -I/opt/gnome/include/gtk-2.0"
|
||||
PKG_CHECK_MODULES([GTK], [gtk+-2.0], [
|
||||
WX_CFLAGS="$WX_CFLAGS $GTK_CFLAGS"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS $GTK_CFLAGS"
|
||||
])
|
||||
else
|
||||
# if gtk-config exists, then add it to the cflags.
|
||||
gtkconf=`gtk-config --cflags`
|
||||
if test $? = 0; then
|
||||
# gtk-config was found and returned 0, so it must return valid output
|
||||
WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
|
||||
WX_CFLAGS="$WX_CFLAGS $gtkconf"
|
||||
WX_CXXFLAGS="$WX_CXXFLAGS $gtkconf"
|
||||
fi
|
||||
fi
|
||||
# GUI_C*FLAGS are added to the compilation of every bochs file, not just
|
||||
|
||||
Loading…
Reference in New Issue
Block a user