#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.3.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.4.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.5.3'
-PACKAGE_STRING='wxWidgets 2.5.3'
+PACKAGE_VERSION='2.5.4'
+PACKAGE_STRING='wxWidgets 2.5.4'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wxWidgets 2.5.3 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.5.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWidgets 2.5.3:";;
+ short | recursive ) echo "Configuration of wxWidgets 2.5.4:";;
esac
cat <<\_ACEOF
--enable-dataobj use data object classes
--enable-ipc use interprocess communication (wxSocket etc.)
--enable-apple_ieee use the Apple IEEE codec
+ --enable-arcstream use wxArchive streams
--enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)
--enable-backtrace use wxStackWalker class for getting backtraces
--enable-cmdline use wxCmdLineParser class
--enable-sound use wxSound class
--enable-mediactrl use wxMediaCtrl class
--enable-wxprintfv use wxWidgets implementation of vprintf()
- --enable-zipstream use wxZipInputStream
+ --enable-zipstream use wxZip streams
--enable-url use wxURL class
--enable-protocol use wxProtocol class
--enable-protocol-http HTTP support in wxProtocol
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 2.5.3
+wxWidgets configure 2.5.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWidgets $as_me 2.5.3, which was
+It was created by wxWidgets $as_me 2.5.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
DEFAULT_wxUSE_FS_INET=no
DEFAULT_wxUSE_FS_ZIP=no
DEFAULT_wxUSE_BUSYINFO=no
+ DEFAULT_wxUSE_ARCSTREAM=no
DEFAULT_wxUSE_ZIPSTREAM=no
DEFAULT_wxUSE_VALIDATORS=no
DEFAULT_wxUSE_FS_INET=yes
DEFAULT_wxUSE_FS_ZIP=yes
DEFAULT_wxUSE_BUSYINFO=yes
+ DEFAULT_wxUSE_ARCSTREAM=yes
DEFAULT_wxUSE_ZIPSTREAM=yes
DEFAULT_wxUSE_VALIDATORS=yes
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-arcstream or --disable-arcstream was given.
+if test "${enable_arcstream+set}" = set; then
+ enableval="$enable_arcstream"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_arcstream='wxUSE_ARCSTREAM=yes'
+ else
+ ac_cv_use_arcstream='wxUSE_ARCSTREAM=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_ARCSTREAM" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_arcstream='wxUSE_ARCSTREAM='$DEFAULT_wxUSE_ARCSTREAM
+
+fi;
+
+ eval "$ac_cv_use_arcstream"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ARCSTREAM" = yes; 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
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
;;
+ *-*-hpux* )
+ SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib"
+ WXCONFIG_RPATH="-Wl,+b,\$libdir"
+ ;;
+
esac
if test $wxUSE_RPATH = "no"; then
fi
- if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then
+ if test "$USE_HPUX" = 1; then
CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
fi
fi
-if test "$wxUSE_ZIPSTREAM" = "yes"; then
+if test "$wxUSE_ARCSTREAM" = "yes"; then
cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ARCSTREAM 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+ if test "$wxUSE_ARCSTREAM" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5
+echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
+ elif test "$wxUSE_ZLIB" = "no"; then
+ { echo "$as_me:$LINENO: WARNING: wxZip requires wxZlib... disabled" >&5
+echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;}
+ else
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_ZIPSTREAM 1
_ACEOF
+ fi
fi
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
echo "$as_me:$LINENO: result: gcc" >&5
echo "${ECHO_T}gcc" >&6
elif test "x$MWCC" = "xyes"; then
- DEPSMODE=gcc
+ DEPSMODE=mwcc
DEPS_TRACKING=1
- DEPSFLAG_GCC="-MMD"
+ DEPSFLAG_MWCC="-MM"
echo "$as_me:$LINENO: result: mwcc" >&5
echo "${ECHO_T}mwcc" >&6
else
DEPSMODE=${DEPSMODE}
DEPSDIR=.deps
DEPSFLAG_GCC="${DEPSFLAG_GCC}"
+DEPSFLAG_MWCC="${DEPSFLAG_MWCC}"
mkdir -p ${D}DEPSDIR
fi
fi
exit 0
+elif test ${D}DEPSMODE = mwcc ; then
+ ${D}*
+ status=${D}?
+ if test ${D}{status} != 0 ; then
+ exit ${D}{status}
+ fi
+ # Run mwcc again with -MM and redirect into the dep file we want
+ # NOTE: We can't use shift here because we need ${D}* to be valid
+ prevarg=
+ for arg in ${D}* ; do
+ if test "${D}prevarg" = "-o"; then
+ objfile=${D}arg
+ else
+ case "${D}arg" in
+ -* )
+ ;;
+ * )
+ srcfile=${D}arg
+ ;;
+ esac
+ fi
+ prevarg="${D}arg"
+ done
+ ${D}* ${D}DEPSFLAG_MWCC >${D}{DEPSDIR}/${D}{objfile}.d
+ exit 0
else
${D}*
exit ${D}?
- BAKEFILE_BAKEFILE_M4_VERSION="0.1.5"
+ BAKEFILE_BAKEFILE_M4_VERSION="0.1.6"
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.5"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.6"
} >&5
cat >&5 <<_CSEOF
-This file was extended by wxWidgets $as_me 2.5.3, which was
+This file was extended by wxWidgets $as_me 2.5.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wxWidgets config.status 2.5.3
+wxWidgets config.status 2.5.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"