moving to autoconf-2.5x

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-24 21:56:41 +00:00
parent f70083b694
commit e6cc62c672
8 changed files with 24415 additions and 15612 deletions

File diff suppressed because it is too large Load Diff

View File

@ -4,219 +4,225 @@ dnl Do not modify, all changes will be overwritten!
dnl Conditions:
dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
COND_WXUSE_ZLIBBUILTIN="#"
dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
COND_WXUSE_ZLIB_BUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIBBUILTIN=
COND_WXUSE_ZLIB_BUILTIN=
fi
AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
dnl ### begin block COND_UNICODE1 ###
COND_UNICODE1="#"
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
dnl ### begin block COND_UNICODE_1 ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE1=
COND_UNICODE_1=
fi
AC_SUBST(COND_UNICODE1)
dnl ### begin block COND_BUILDDEBUG ###
COND_BUILDDEBUG="#"
AC_SUBST(COND_UNICODE_1)
dnl ### begin block COND_BUILD_DEBUG ###
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILDDEBUG=
COND_BUILD_DEBUG=
fi
AC_SUBST(COND_BUILDDEBUG)
dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
COND_WXUSE_REGEXBUILTIN="#"
AC_SUBST(COND_BUILD_DEBUG)
dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEXBUILTIN=
COND_WXUSE_REGEX_BUILTIN=
fi
AC_SUBST(COND_WXUSE_REGEXBUILTIN)
dnl ### begin block COND_USE_SOSYMLINKS1 ###
COND_USE_SOSYMLINKS1="#"
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
dnl ### begin block COND_USE_SOSYMLINKS_1 ###
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS1=
COND_USE_SOSYMLINKS_1=
fi
AC_SUBST(COND_USE_SOSYMLINKS1)
dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
COND_WXUSE_LIBJPEGBUILTIN="#"
AC_SUBST(COND_USE_SOSYMLINKS_1)
dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEGBUILTIN=
COND_WXUSE_LIBJPEG_BUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
COND_WXUSE_LIBPNGBUILTIN="#"
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNGBUILTIN=
COND_WXUSE_LIBPNG_BUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
COND_WXUSE_ODBCBUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBCBUILTIN=
fi
AC_SUBST(COND_WXUSE_ODBCBUILTIN)
dnl ### begin block COND_TOOLKITGTK ###
COND_TOOLKITGTK="#"
if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKITGTK=
fi
AC_SUBST(COND_TOOLKITGTK)
dnl ### begin block COND_TOOLKITMOTIF ###
COND_TOOLKITMOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKITMOTIF=
fi
AC_SUBST(COND_TOOLKITMOTIF)
dnl ### begin block COND_TOOLKITMSW ###
COND_TOOLKITMSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKITMSW=
fi
AC_SUBST(COND_TOOLKITMSW)
dnl ### begin block COND_TOOLKITMAC ###
COND_TOOLKITMAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKITMAC=
fi
AC_SUBST(COND_TOOLKITMAC)
dnl ### begin block COND_TOOLKITCOCOA ###
COND_TOOLKITCOCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKITCOCOA=
fi
AC_SUBST(COND_TOOLKITCOCOA)
dnl ### begin block COND_TOOLKITOS2 ###
COND_TOOLKITOS2="#"
if test "x$TOOLKIT" = "xOS2" ; then
COND_TOOLKITOS2=
fi
AC_SUBST(COND_TOOLKITOS2)
dnl ### begin block COND_TOOLKITX11 ###
COND_TOOLKITX11="#"
if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKITX11=
fi
AC_SUBST(COND_TOOLKITX11)
dnl ### begin block COND_TOOLKITMGL ###
COND_TOOLKITMGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKITMGL=
fi
AC_SUBST(COND_TOOLKITMGL)
dnl ### begin block COND_WXUNIV1 ###
COND_WXUNIV1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV1=
fi
AC_SUBST(COND_WXUNIV1)
dnl ### begin block COND_SHARED0_MONOLITHIC1 ###
COND_SHARED0_MONOLITHIC1="#"
if test "x$SHARED" = "x0" -a \
"x$MONOLITHIC" = "x1" ; then
COND_SHARED0_MONOLITHIC1=
fi
AC_SUBST(COND_SHARED0_MONOLITHIC1)
dnl ### begin block COND_SHARED1_MONOLITHIC1 ###
COND_SHARED1_MONOLITHIC1="#"
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block COND_SHARED_1_MONOLITHIC_1 ###
COND_SHARED_1_MONOLITHIC_1="#"
if test "x$SHARED" = "x1" -a \
"x$MONOLITHIC" = "x1" ; then
COND_SHARED1_MONOLITHIC1=
COND_SHARED_1_MONOLITHIC_1=
fi
AC_SUBST(COND_SHARED1_MONOLITHIC1)
dnl ### begin block COND_PLATFORM_UNIX1 ###
COND_PLATFORM_UNIX1="#"
AC_SUBST(COND_SHARED_1_MONOLITHIC_1)
dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
COND_WXUSE_ODBC_BUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBC_BUILTIN=
fi
AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
dnl ### begin block COND_TOOLKIT_GTK ###
COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK=
fi
AC_SUBST(COND_TOOLKIT_GTK)
dnl ### begin block COND_TOOLKIT_MOTIF ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=
fi
AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block COND_TOOLKIT_MSW ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=
fi
AC_SUBST(COND_TOOLKIT_MSW)
dnl ### begin block COND_TOOLKIT_MAC ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block COND_TOOLKIT_COCOA ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=
fi
AC_SUBST(COND_TOOLKIT_COCOA)
dnl ### begin block COND_TOOLKIT_OS2 ###
COND_TOOLKIT_OS2="#"
if test "x$TOOLKIT" = "xOS2" ; then
COND_TOOLKIT_OS2=
fi
AC_SUBST(COND_TOOLKIT_OS2)
dnl ### begin block COND_TOOLKIT_X11 ###
COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11=
fi
AC_SUBST(COND_TOOLKIT_X11)
dnl ### begin block COND_TOOLKIT_MGL ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=
fi
AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block COND_WXUNIV_1 ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=
fi
AC_SUBST(COND_WXUNIV_1)
dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block COND_PLATFORM_UNIX_1 ###
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX1=
COND_PLATFORM_UNIX_1=
fi
AC_SUBST(COND_PLATFORM_UNIX1)
dnl ### begin block COND_PLATFORM_MACOSX1 ###
COND_PLATFORM_MACOSX1="#"
AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block COND_PLATFORM_MACOSX_1 ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX1=
COND_PLATFORM_MACOSX_1=
fi
AC_SUBST(COND_PLATFORM_MACOSX1)
dnl ### begin block COND_PLATFORM_WIN321 ###
COND_PLATFORM_WIN321="#"
AC_SUBST(COND_PLATFORM_MACOSX_1)
dnl ### begin block COND_PLATFORM_WIN32_1 ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN321=
COND_PLATFORM_WIN32_1=
fi
AC_SUBST(COND_PLATFORM_WIN321)
dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX0 ###
COND_USE_SOVERSION1_PLATFORM_MACOSX0="#"
AC_SUBST(COND_PLATFORM_WIN32_1)
dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 ###
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
if test "x$USE_SOVERSION" = "x1" -a \
"x$PLATFORM_MACOSX" = "x0" ; then
COND_USE_SOVERSION1_PLATFORM_MACOSX0=
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=
fi
AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX0)
dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX1 ###
COND_USE_SOVERSION1_PLATFORM_MACOSX1="#"
AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_0)
dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 ###
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#"
if test "x$USE_SOVERSION" = "x1" -a \
"x$PLATFORM_MACOSX" = "x1" ; then
COND_USE_SOVERSION1_PLATFORM_MACOSX1=
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
fi
AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX1)
dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
COND_WXUSE_LIBTIFFBUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFFBUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
dnl ### begin block COND_PLATFORM_WIN320 ###
COND_PLATFORM_WIN320="#"
AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_1)
dnl ### begin block COND_PLATFORM_WIN32_0 ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN320=
COND_PLATFORM_WIN32_0=
fi
AC_SUBST(COND_PLATFORM_WIN320)
dnl ### begin block COND_MONOLITHIC1 ###
COND_MONOLITHIC1="#"
AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block COND_MONOLITHIC_1 ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC1=
COND_MONOLITHIC_1=
fi
AC_SUBST(COND_MONOLITHIC1)
dnl ### begin block COND_MONOLITHIC0 ###
COND_MONOLITHIC0="#"
AC_SUBST(COND_MONOLITHIC_1)
dnl ### begin block COND_MONOLITHIC_0 ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC0=
COND_MONOLITHIC_0=
fi
AC_SUBST(COND_MONOLITHIC0)
dnl ### begin block COND_USE_GUI1 ###
COND_USE_GUI1="#"
AC_SUBST(COND_MONOLITHIC_0)
dnl ### begin block COND_USE_GUI_1 ###
COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI1=
COND_USE_GUI_1=
fi
AC_SUBST(COND_USE_GUI1)
dnl ### begin block COND_DEPS_TYPEGCC ###
COND_DEPS_TYPEGCC="#"
AC_SUBST(COND_USE_GUI_1)
dnl ### begin block COND_DEPS_TYPE_GCC ###
COND_DEPS_TYPE_GCC="#"
if test "x$DEPS_TYPE" = "xgcc" ; then
COND_DEPS_TYPEGCC=
COND_DEPS_TYPE_GCC=
fi
AC_SUBST(COND_DEPS_TYPEGCC)
dnl ### begin block COND_USE_GUI0 ###
COND_USE_GUI0="#"
AC_SUBST(COND_DEPS_TYPE_GCC)
dnl ### begin block COND_USE_GUI_0 ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI0=
COND_USE_GUI_0=
fi
AC_SUBST(COND_USE_GUI0)
dnl ### begin block COND_USE_GUI1_WXUNIV0 ###
COND_USE_GUI1_WXUNIV0="#"
AC_SUBST(COND_USE_GUI_0)
dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ###
COND_USE_GUI_1_WXUNIV_0="#"
if test "x$USE_GUI" = "x1" -a \
"x$WXUNIV" = "x0" ; then
COND_USE_GUI1_WXUNIV0=
COND_USE_GUI_1_WXUNIV_0=
fi
AC_SUBST(COND_USE_GUI1_WXUNIV0)
dnl ### begin block COND_USE_GUI1_WXUNIV1 ###
COND_USE_GUI1_WXUNIV1="#"
AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
COND_USE_GUI_1_WXUNIV_1="#"
if test "x$USE_GUI" = "x1" -a \
"x$WXUNIV" = "x1" ; then
COND_USE_GUI1_WXUNIV1=
COND_USE_GUI_1_WXUNIV_1=
fi
AC_SUBST(COND_USE_GUI1_WXUNIV1)
dnl ### begin block COND_USE_SOVERLINUX1 ###
COND_USE_SOVERLINUX1="#"
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
dnl ### begin block COND_SHARED_0_MONOLITHIC_1 ###
COND_SHARED_0_MONOLITHIC_1="#"
if test "x$SHARED" = "x0" -a \
"x$MONOLITHIC" = "x1" ; then
COND_SHARED_0_MONOLITHIC_1=
fi
AC_SUBST(COND_SHARED_0_MONOLITHIC_1)
dnl ### begin block COND_USE_SOVERLINUX_1 ###
COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX1=
COND_USE_SOVERLINUX_1=
fi
AC_SUBST(COND_USE_SOVERLINUX1)
dnl ### begin block COND_USE_SOVERSOLARIS1 ###
COND_USE_SOVERSOLARIS1="#"
AC_SUBST(COND_USE_SOVERLINUX_1)
dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS1=
COND_USE_SOVERSOLARIS_1=
fi
AC_SUBST(COND_USE_SOVERSOLARIS1)
AC_SUBST(COND_USE_SOVERSOLARIS_1)
dnl ### begin block COND_PLATFORM_MAC_1 ###
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=
fi
AC_SUBST(COND_PLATFORM_MAC_1)

33360
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION($Id$)dnl
AC_PREREQ(2.57)
dnl ---------------------------------------------------------------------------
dnl
dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
@ -15,11 +17,16 @@ dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
dnl the file passed to AC_INIT should be specific to our package
AC_INIT([wx-config.in])
AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
dnl sets build, host, target variables and the same with _alias
AC_CANONICAL_SYSTEM
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
dnl When making releases do:
dnl
@ -3017,7 +3024,7 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl use versioned symbols if available on the platform
WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])
dnl the command to use for creating the shared library
SHARED_LD="${CXX} -shared -o"
@ -3070,7 +3077,7 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl substitute this in makelib.env for the contrib libs
WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
fi
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
;;
*-*-solaris2* )
@ -3088,7 +3095,7 @@ if test "$wxUSE_SHARED" = "yes"; then
[],[],
[
AC_MSG_RESULT([yes])
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
],
[
AC_MSG_RESULT([no])
@ -3098,7 +3105,7 @@ if test "$wxUSE_SHARED" = "yes"; then
[],[],
[
AC_MSG_RESULT([yes])
SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)/lib"],
SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],
[
AC_MSG_RESULT([no])
])
@ -3109,7 +3116,7 @@ if test "$wxUSE_SHARED" = "yes"; then
PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
SAMPLES_RPATH_FLAG="-R\$(top_builddir)/lib"
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
@ -3236,7 +3243,7 @@ MACSETFILE="@#"
MACRESWXCONFIG="#"
if test "$wxUSE_MAC" = 1; then
dnl add the resources target for wxMac
LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
WX_ALL="${WX_ALL} ${LIBWXMACRES}"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
@ -3706,6 +3713,20 @@ fi
fi
dnl if !MSW
dnl ------------------------------------------
dnl Checks specific to contrib libs (MMedia)
dnl ------------------------------------------
dnl Check for ESD:
ESD_LINK=
AC_CHECK_HEADER([esd.h], [
AC_CHECK_LIB(esd, esd_close, [
ESD_LINK="-lesd"
])
])
dnl ===========================================================================
dnl Now we have all the info we need - use it!
dnl ===========================================================================
@ -5420,7 +5441,7 @@ fi
AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
dnl define the variables used in wx-config
top_builddir=`pwd`
top_builddir_wxconfig=`pwd`
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
@ -5509,7 +5530,7 @@ dnl and other stuff for the built in libraries should come first to avoid
dnl including the system headers with the same name (it is particularly
dnl important for zlib because XFree 4.2.0 has its own, horribly old and
dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
-I\${top_srcdir}/include \
$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
$TOOLKIT_INCLUDE"
@ -5635,7 +5656,7 @@ AC_SUBST(TOOLCHAIN_DEFS)
AC_SUBST(TOOLCHAIN_DLL_DEFS)
dnl wx-config options
AC_SUBST(top_builddir)
AC_SUBST(top_builddir_wxconfig)
AC_SUBST(host_alias)
AC_SUBST(cross_compiling)
AC_SUBST(WXCONFIG_LIBS)
@ -5693,6 +5714,10 @@ AC_SUBST(MAKEINFO)
AC_SUBST(INSTALL_LIBRARY)
AC_SUBST(INSTALL_DIR)
dnl contrib tests results:
AC_SUBST(ESD_LINK)
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
dnl - and we do use it)
@ -5703,48 +5728,18 @@ if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
fi
AC_CONFIG_HEADER(setup.h:setup.h.in)
dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
dnl samples and the only way to do it is to use the environment (another
dnl idea could have been to use the cache but this wouldn't work when
dnl configure doesn't use cache at all which is the default with autoconf 2.50)
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
wx_cv_if_gnu_make=$IF_GNU_MAKE
wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
wx_cv_library_basename=${WX_LIBRARY_BASENAME}
wx_cv_release=${WX_RELEASE}
wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE}
wx_cv_use_gui=${USE_GUI}
wx_cv_use_resources=${wxUSE_RESOURCES}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
wx_cv_library_basename \
wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
wx_cv_use_gui wx_cv_use_resources \
CFLAGS LDFLAGS CXXFLAGS CPPFLAGS \
top_builddir USE_GUI MONOLITHIC \
wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG \
wxUSE_LIBTIFF EXTRALIBS UNICODE BUILD SHARED TOOLKIT TOOLKIT_LOWERCASE \
TOOLKIT_VERSION SAMPLES_RPATH_FLAG WXUNIV
AC_CONFIG_SUBDIRS(demos samples utils contrib)
AC_CONFIG_HEADERS([setup.h])
dnl create each of the files in the space separated list from the file.in
dnl (the original file name may be overriden by appending another name after a
dnl colon)
AC_OUTPUT([
AC_CONFIG_FILES([
wx-config
version-script
Makefile
],
])
AC_CONFIG_COMMANDS([default],
[
dnl This test is required to make the following idempotent.
dnl Otherwise running config.status or rerunning configure
@ -5784,6 +5779,177 @@ AC_OUTPUT([
]
)
dnl Configure samples if their sources are present:
if test -d ${srcdir}/samples ; then
AC_CONFIG_FILES([
samples/Makefile
samples/access/Makefile
samples/artprov/Makefile
samples/caret/Makefile
samples/calendar/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
samples/console/Makefile
samples/db/Makefile
samples/dialogs/Makefile
samples/dialup/Makefile
samples/docview/Makefile
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/dragimag/Makefile
samples/drawing/Makefile
samples/dynamic/Makefile
samples/erase/Makefile
samples/event/Makefile
samples/exec/Makefile
samples/font/Makefile
samples/grid/Makefile
samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
samples/ipc/Makefile
samples/joytest/Makefile
samples/keyboard/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/menu/Makefile
samples/memcheck/Makefile
samples/minifram/Makefile
samples/minimal/Makefile
samples/mobile/Makefile
samples/mobile/wxedit/Makefile
samples/mobile/styles/Makefile
samples/multimon/Makefile
samples/notebook/Makefile
samples/oleauto/Makefile
samples/ownerdrw/Makefile
samples/png/Makefile
samples/printing/Makefile
samples/propsize/Makefile
samples/regtest/Makefile
samples/rotate/Makefile
samples/sashtest/Makefile
samples/shaped/Makefile
samples/scroll/Makefile
samples/scrollsub/Makefile
samples/sockets/Makefile
samples/splitter/Makefile
samples/statbar/Makefile
samples/taskbar/Makefile
samples/text/Makefile
samples/thread/Makefile
samples/toolbar/Makefile
samples/treectrl/Makefile
samples/typetest/Makefile
samples/validate/Makefile
samples/widgets/Makefile
samples/wizard/Makefile
samples/htlbox/Makefile
samples/html/Makefile
samples/html/about/Makefile
samples/html/help/Makefile
samples/html/printing/Makefile
samples/html/helpview/Makefile
samples/html/test/Makefile
samples/html/zip/Makefile
samples/html/virtual/Makefile
samples/html/widget/Makefile
samples/opengl/Makefile
samples/opengl/cube/Makefile
samples/opengl/penguin/Makefile
samples/opengl/isosurf/Makefile
])
fi
dnl Configure demos if their sources are present:
if test -d ${srcdir}/demos ; then
AC_CONFIG_FILES([
demos/Makefile
demos/bombs/Makefile
demos/dbbrowse/Makefile
demos/forty/Makefile
demos/fractal/Makefile
demos/life/Makefile
demos/poem/Makefile
])
fi
dnl Configure utils if their sources are present:
if test -d ${srcdir}/utils ; then
AC_CONFIG_FILES([
utils/Makefile
utils/makegen/Makefile
utils/HelpGen/Makefile
utils/HelpGen/src/Makefile
utils/tex2rtf/Makefile
utils/tex2rtf/src/Makefile
utils/hhp2cached/Makefile
utils/dialoged/Makefile
utils/dialoged/src/Makefile
utils/emulator/Makefile
utils/emulator/src/Makefile
utils/helpview/Makefile
utils/helpview/src/Makefile
utils/configtool/Makefile
utils/configtool/src/Makefile
])
fi
dnl Configure contrib libs & samples if their sources are present:
if test -d ${srcdir}/contrib ; then
AC_CONFIG_FILES([
contrib/src/Makefile
contrib/src/deprecated/Makefile
contrib/src/ogl/Makefile
contrib/src/mmedia/Makefile
contrib/src/stc/Makefile
contrib/src/svg/Makefile
contrib/src/xrc/Makefile
contrib/src/gizmos/Makefile
contrib/src/plot/Makefile
contrib/src/applet/Makefile
contrib/src/fl/Makefile
contrib/src/net/Makefile
contrib/samples/Makefile
contrib/samples/deprecated/Makefile
contrib/samples/deprecated/proplist/Makefile
contrib/samples/deprecated/resource/Makefile
contrib/samples/deprecated/treelay/Makefile
contrib/samples/mmedia/Makefile
contrib/samples/ogl/Makefile
contrib/samples/ogl/ogledit/Makefile
contrib/samples/ogl/studio/Makefile
contrib/samples/stc/Makefile
contrib/samples/svg/Makefile
contrib/samples/gizmos/Makefile
contrib/samples/gizmos/editlbox/Makefile
contrib/samples/gizmos/dynsash/Makefile
contrib/samples/gizmos/dynsash_switch/Makefile
contrib/samples/gizmos/multicell/Makefile
contrib/samples/gizmos/splittree/Makefile
contrib/samples/gizmos/led/Makefile
contrib/samples/xrc/Makefile
contrib/samples/plot/Makefile
contrib/samples/applet/Makefile
contrib/samples/fl/Makefile
contrib/samples/fl/fl_demo1/Makefile
contrib/samples/fl/fl_demo2/Makefile
contrib/samples/fl/fl_sample1/Makefile
contrib/samples/fl/fl_sample2/Makefile
contrib/samples/fl/fl_sample3/Makefile
contrib/utils/Makefile
contrib/utils/wxrc/Makefile
contrib/utils/wxrcedit/Makefile
contrib/utils/convertrc/Makefile
])
fi
AC_OUTPUT
dnl report on what we decided to do
echo
echo "Configured wxWindows ${WX_VERSION} for \`${host}'"

505
samples/aclocal.m4 vendored
View File

@ -1,505 +0,0 @@
# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
dnl ---------------------------------------------------------------------------
dnl Support macros for makefiles generated by BAKEFILE.
dnl ---------------------------------------------------------------------------
dnl Lots of compiler & linker detection code contained here was taken from
dnl wxWindows configure.in script (see http://www.wxwindows.org)
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_GNUMAKE
dnl
dnl Detects GNU make
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_GNUMAKE,
[
dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
[
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU > /dev/null); then
bakefile_cv_prog_makeisgnu="yes"
else
bakefile_cv_prog_makeisgnu="no"
fi
])
if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
AC_SUBST(IF_GNU_MAKE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_PLATFORM
dnl
dnl Detects platform and sets PLATFORM_XXX variables accordingly
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_PLATFORM,
[
PLATFORM_UNIX=0
PLATFORM_WIN32=0
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
PLATFORM_WIN32=1
;;
*-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
PLATFORM_MSDOS=1
;;
powerpc-*-darwin* )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
;;
* )
PLATFORM_UNIX=1
;;
esac
AC_SUBST(PLATFORM_UNIX)
AC_SUBST(PLATFORM_WIN32)
AC_SUBST(PLATFORM_MSDOS)
AC_SUBST(PLATFORM_MAC)
AC_SUBST(PLATFORM_MACOSX)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SUFFIXES
dnl
dnl Detects shared various suffixes for shared libraries, libraries, programs,
dnl plugins etc.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SUFFIXES,
[
SO_SUFFIX="so"
EXEEXT=""
DLLPREFIX=lib
case "${host}" in
*-hp-hpux* )
SO_SUFFIX="sl"
;;
*-*-aix* )
dnl quoting from
dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
dnl Both archive libraries and shared libraries on AIX have an
dnl .a extension. This will explain why you can't link with an
dnl .so and why it works with the name changed to .a.
SO_SUFFIX="a"
;;
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll"
EXEEXT=".exe"
DLLPREFIX=""
;;
*-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
EXEEXT=".exe"
DLLPREFIX=""
;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
;;
esac
AC_SUBST(SO_SUFFIX)
AC_SUBST(EXEEXT)
AC_SUBST(DLLPREFIX)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SHARED_LD
dnl
dnl Detects command for making shared libraries, substitutes SHARED_LD_CC
dnl and SHARED_LD_CXX.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SHARED_LD,
[
dnl Defaults for GCC and ELF .so shared libs:
SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o"
dnl the extra compiler flags needed for compilation of shared library
if test "x$GCC" = "xyes"; then
dnl the switch for gcc is the same under all platforms
PIC_FLAG="-fPIC"
fi
case "${host}" in
*-hp-hpux* )
dnl default settings are good for gcc but not for the native HP-UX
if test "x$GCC" = "xyes"; then
dnl -o flag must be after PIC flag
SHARED_LD_CC="${CC} -shared ${PIC_FLAG} -o"
SHARED_LD_CXX="${CXX} -shared ${PIC_FLAG} -o"
else
dnl no idea why it wants it, but it does
LDFLAGS="$LDFLAGS -L/usr/lib"
SHARED_LD_CC="${CC} -b -o"
SHARED_LD_CXX="${CXX} -b -o"
PIC_FLAG="+Z"
fi
;;
*-*-linux* )
if test "x$GCC" != "xyes"; then
AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
[
AC_TRY_COMPILE([],
[
#ifndef __INTEL_COMPILER
#error Not icc
#endif
],
bakefile_cv_prog_icc=yes,
bakefile_cv_prog_icc=no
)
])
if test "$bakefile_cv_prog_icc" = "yes"; then
PIC_FLAG="-KPIC"
fi
fi
;;
*-*-solaris2* )
if test "x$GCC" != xyes ; then
SHARED_LD_CC="${CC} -G -o"
SHARED_LD_CXX="${CXX} -G -o"
PIC_FLAG="-KPIC"
fi
;;
*-*-darwin* )
dnl For Unix to MacOS X porting instructions, see:
dnl http://fink.sourceforge.net/doc/porting/porting.html
CFLAGS="$CFLAGS -fno-common"
CXXFLAGS="$CXXFLAGS -fno-common"
dnl Most apps benefit from being fully binded (its faster and static
dnl variables initialized at startup work).
dnl This can be done either with the exe linker flag -Wl,-bind_at_load
dnl or with a double stage link in order to create a single module
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
cat <<EOF >shared-ld-sh
#!/bin/sh
#-----------------------------------------------------------------------------
#-- Name: distrib/mac/shared-ld-sh
#-- Purpose: Link a mach-o dynamic shared library for Darwin / Mac OS X
#-- Author: Gilles Depeyrot
#-- Copyright: (c) 2002 Gilles Depeyrot
#-- Licence: any use permitted
#-----------------------------------------------------------------------------
verbose=0
args=""
objects=""
while test \${#} -gt 0; do
case \${1} in
-v)
verbose=1
;;
-o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
# collect these options and values
args="\${args} \${1} \${2}"
shift
;;
-l*|-L*|-flat_namespace)
# collect these options
args="\${args} \${1}"
;;
-dynamiclib)
# skip these options
;;
-*)
echo "shared-ld: unhandled option '\${1}'"
exit 1
;;
*.o | *.a)
# collect object files
objects="\${objects} \${1}"
;;
*)
echo "shared-ld: unhandled argument '\${1}'"
exit 1
;;
esac
shift
done
#
# Link one module containing all the others
#
if test \${verbose} = 1; then
echo "c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o"
fi
c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o
status=\$?
if test \${status} != 0; then
exit \${status}
fi
#
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
echo "cc -dynamiclib master.\$\$.o \${args}"
fi
c++ -dynamiclib master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
fi
#
# Remove intermediate module
#
rm -f master.\$\$.o
exit 0
EOF
chmod +x shared-ld-sh
SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_CC"
PIC_FLAG="-dynamic -fPIC"
dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
dnl matter for C projects and matters for C++ ones
dnl FIXME - newer devel tools have linker flag to do this, the script
dnl is not necessary - detect!
;;
*-*-aix* )
dnl default settings are ok for gcc
if test "x$GCC" != "xyes"; then
dnl the abs path below used to be hardcoded here so I guess it must
dnl be some sort of standard location under AIX?
AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
dnl FIXME - what about makeCSharedLib?
SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
fi
;;
*-*-beos* )
dnl can't use gcc under BeOS for shared library creation because it
dnl complains about missing 'main'
SHARED_LD_CC="${LD} -shared -o"
SHARED_LD_CXX="${LD} -shared -o"
;;
*-*-irix* )
dnl default settings are ok for gcc
if test "x$GCC" != "xyes"; then
PIC_FLAG="-KPIC"
fi
;;
*-*-cygwin* | *-*-mingw32* )
PIC_FLAG=""
;;
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
*-*-sysv5* )
dnl defaults are ok
;;
*)
AC_MSG_ERROR(unknown system type $host.)
esac
AC_SUBST(SHARED_LD_CC)
AC_SUBST(SHARED_LD_CXX)
AC_SUBST(PIC_FLAG)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SHARED_VERSIONS
dnl
dnl Detects linker options for attaching versions (sonames) to shared libs.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
[
USE_SOVERSION=0
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
case "${host}" in
*-*-linux* )
SONAME_FLAG="-Wl,-soname,"
USE_SOVERSION=1
USE_SOVERLINUX=1
USE_SOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
USE_SOSYMLINKS=1
;;
esac
AC_SUBST(USE_SOVERSION)
AC_SUBST(USE_SOVERLINUX)
AC_SUBST(USE_SOVERSOLARIS)
AC_SUBST(USE_MACVERSION)
AC_SUBST(USE_SOSYMLINKS)
AC_SUBST(SONAME_FLAG)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_DEPS
dnl
dnl Detects available C/C++ dependency tracking options
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_DEPS,
[
DEPS_TYPE=no
if test "x$GCC" = "xyes"; then
DEPS_TYPE=gcc
fi
AC_SUBST(DEPS_TYPE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_CHECK_BASIC_STUFF
dnl
dnl Checks for presence of basic programs, such as C and C++ compiler, "ranlib"
dnl or "install"
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
[
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_SUBST(MAKE_SET)
if test "$build" != "$host" ; then
AR=$host_alias-ar
STRIP=$host_alias-strip
else
AC_CHECK_PROG(AR, ar, ar, ar)
AC_CHECK_PROG(STRIP, strip, strip, true)
fi
case ${host} in
*-hp-hpux* )
INSTALL_DIR="mkdir"
;;
*) INSTALL_DIR="$INSTALL -d"
;;
esac
AC_SUBST(INSTALL_DIR)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_RES_COMPILERS
dnl
dnl Checks for presence of resource compilers for win32 or mac
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
[
RESCOMP=
SETFILE=
case ${host} in
*-*-cygwin* | *-*-mingw32* )
dnl Check for win32 resources compiler:
if test "$build" != "$host" ; then
RESCOMP=$host_alias-windres
else
AC_CHECK_PROG(RESCOMP, windres, windres, windres)
fi
;;
*-*-darwin* )
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
;;
esac
AC_SUBST(RESCOMP)
AC_SUBST(SETFILE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE
dnl
dnl To be used in configure.in of any project using Bakefile-generated mks
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE,
[
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
AC_BAKEFILE_CHECK_BASIC_STUFF
fi
AC_BAKEFILE_GNUMAKE
AC_BAKEFILE_PLATFORM
AC_BAKEFILE_SUFFIXES
AC_BAKEFILE_SHARED_LD
AC_BAKEFILE_SHARED_VERSIONS
AC_BAKEFILE_DEPS
AC_BAKEFILE_RES_COMPILERS
builtin(include, autoconf_inc.m4)
])

View File

@ -4,111 +4,27 @@ dnl Do not modify, all changes will be overwritten!
dnl Conditions:
dnl ### begin block COND_PLATFORM_WIN321 ###
COND_PLATFORM_WIN321="#"
dnl ### begin block COND_PLATFORM_WIN32_1 ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN321=
COND_PLATFORM_WIN32_1=
fi
AC_SUBST(COND_PLATFORM_WIN321)
dnl ### begin block COND_PLATFORM_WIN320 ###
COND_PLATFORM_WIN320="#"
AC_SUBST(COND_PLATFORM_WIN32_1)
dnl ### begin block COND_PLATFORM_WIN32_0 ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN320=
COND_PLATFORM_WIN32_0=
fi
AC_SUBST(COND_PLATFORM_WIN320)
dnl ### begin block COND_DEPS_TYPEGCC ###
COND_DEPS_TYPEGCC="#"
if test "x$DEPS_TYPE" = "xgcc" ; then
COND_DEPS_TYPEGCC=
fi
AC_SUBST(COND_DEPS_TYPEGCC)
dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
COND_WXUSE_ZLIBBUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIBBUILTIN=
fi
AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
dnl ### begin block COND_UNICODE1 ###
COND_UNICODE1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE1=
fi
AC_SUBST(COND_UNICODE1)
dnl ### begin block COND_BUILDDEBUG ###
COND_BUILDDEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILDDEBUG=
fi
AC_SUBST(COND_BUILDDEBUG)
dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
COND_WXUSE_LIBJPEGBUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEGBUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
COND_WXUSE_ODBCBUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBCBUILTIN=
fi
AC_SUBST(COND_WXUSE_ODBCBUILTIN)
dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
COND_WXUSE_LIBPNGBUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNGBUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
dnl ### begin block COND_MONOLITHIC0 ###
COND_MONOLITHIC0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC0=
fi
AC_SUBST(COND_MONOLITHIC0)
dnl ### begin block COND_WXUNIV1 ###
COND_WXUNIV1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV1=
fi
AC_SUBST(COND_WXUNIV1)
dnl ### begin block COND_PLATFORM_MAC1 ###
COND_PLATFORM_MAC1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC1=
fi
AC_SUBST(COND_PLATFORM_MAC1)
dnl ### begin block COND_TOOLKITMAC ###
COND_TOOLKITMAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKITMAC=
fi
AC_SUBST(COND_TOOLKITMAC)
dnl ### begin block COND_MONOLITHIC1 ###
COND_MONOLITHIC1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC1=
fi
AC_SUBST(COND_MONOLITHIC1)
dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
COND_WXUSE_LIBTIFFBUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFFBUILTIN=
fi
AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
dnl ### begin block COND_USE_GUI0 ###
COND_USE_GUI0="#"
AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block COND_USE_GUI_0 ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI0=
COND_USE_GUI_0=
fi
AC_SUBST(COND_USE_GUI0)
dnl ### begin block COND_USE_GUI1 ###
COND_USE_GUI1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI1=
AC_SUBST(COND_USE_GUI_0)
dnl ### begin block COND_DEPS_TYPE_GCC ###
COND_DEPS_TYPE_GCC="#"
if test "x$DEPS_TYPE" = "xgcc" ; then
COND_DEPS_TYPE_GCC=
fi
AC_SUBST(COND_USE_GUI1)
dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
COND_WXUSE_REGEXBUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEXBUILTIN=
fi
AC_SUBST(COND_WXUSE_REGEXBUILTIN)
AC_SUBST(COND_DEPS_TYPE_GCC)

2387
samples/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,133 +0,0 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION($Id$)dnl
AC_INIT(Makefile.in)
AC_CANONICAL_SYSTEM
AC_PROG_CC
AC_PROG_CXX
dnl we need the values the main configure determined for us, so refuse
dnl to run if we don't have them
if test "x$wx_cv_path_samplesubdirs" = "x"; then
AC_MSG_ERROR([Please run configure from the top level directory.])
fi
SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
AC_SUBST(SAMPLES_SUBDIRS)
IF_GNU_MAKE=$wx_cv_if_gnu_make
PATH_IFS=$wx_cv_path_ifs
PROGRAM_EXT=$wx_cv_program_ext
WX_TARGET_LIBRARY=$wx_cv_target_library
WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl
USE_GUI=$wx_cv_use_gui
AC_SUBST(top_builddir)
AC_SUBST(IF_GNU_MAKE)
AC_SUBST(PATH_IFS)
AC_SUBST(PROGRAM_EXT)
AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_TARGET_LIBRARY_GL)
AC_SUBST(wxUSE_ZLIB)
AC_SUBST(wxUSE_REGEX)
AC_SUBST(wxUSE_ODBC)
AC_SUBST(wxUSE_LIBJPEG)
AC_SUBST(wxUSE_LIBPNG)
AC_SUBST(wxUSE_LIBTIFF)
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_LOWERCASE)
AC_SUBST(TOOLKIT_VERSION)
AC_SUBST(EXTRALIBS)
AC_SUBST(WXUNIV)
AC_SUBST(UNICODE)
AC_SUBST(BUILD)
AC_SUBST(SHARED)
AC_SUBST(USE_GUI)
AC_SUBST(MONOLITHIC)
AC_SUBST(SAMPLES_RPATH_FLAG)
AC_BAKEFILE
AC_OUTPUT([
Makefile
access/Makefile
artprov/Makefile
caret/Makefile
calendar/Makefile
checklst/Makefile
config/Makefile
controls/Makefile
console/Makefile
db/Makefile
dialogs/Makefile
dialup/Makefile
docview/Makefile
docvwmdi/Makefile
dnd/Makefile
dragimag/Makefile
drawing/Makefile
dynamic/Makefile
erase/Makefile
event/Makefile
exec/Makefile
font/Makefile
grid/Makefile
help/Makefile
image/Makefile
internat/Makefile
ipc/Makefile
joytest/Makefile
keyboard/Makefile
layout/Makefile
listctrl/Makefile
mdi/Makefile
menu/Makefile
memcheck/Makefile
minifram/Makefile
minimal/Makefile
mobile/Makefile
mobile/wxedit/Makefile
mobile/styles/Makefile
multimon/Makefile
notebook/Makefile
oleauto/Makefile
ownerdrw/Makefile
png/Makefile
printing/Makefile
propsize/Makefile
regtest/Makefile
rotate/Makefile
sashtest/Makefile
shaped/Makefile
scroll/Makefile
scrollsub/Makefile
sockets/Makefile
splitter/Makefile
statbar/Makefile
taskbar/Makefile
text/Makefile
thread/Makefile
toolbar/Makefile
treectrl/Makefile
typetest/Makefile
validate/Makefile
widgets/Makefile
wizard/Makefile
htlbox/Makefile
html/Makefile
html/about/Makefile
html/help/Makefile
html/printing/Makefile
html/helpview/Makefile
html/test/Makefile
html/zip/Makefile
html/virtual/Makefile
html/widget/Makefile
opengl/Makefile
opengl/cube/Makefile
opengl/penguin/Makefile
opengl/isosurf/Makefile
])