dnl Version: $Id$
dnl ---------------------------------------------------------------------------
-dnl ===========================================================================
-dnl macros to find the a file in the list of include/lib paths
-dnl ===========================================================================
-
-dnl ---------------------------------------------------------------------------
-dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
-dnl to the full name of the file that was found or leaves it empty if not found
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(WX_PATH_FIND_INCLUDES,
-[
-ac_find_includes=
-for ac_dir in $1;
- do
- if test -f "$ac_dir/$2"; then
- ac_find_includes=$ac_dir
- break
- fi
- done
-])
-
-dnl ---------------------------------------------------------------------------
-dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_libraries
-dnl to the full name of the file that was found or leaves it empty if not found
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(WX_PATH_FIND_LIBRARIES,
-[
-ac_find_libraries=
-for ac_dir in $1;
- do
- for ac_extension in a so sl dylib; do
- if test -f "$ac_dir/lib$2.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Path to include, already defined
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(WX_INCLUDE_PATH_EXIST,
-[
- ac_path_to_include=$1
- echo "$2" | grep "\-I$1" > /dev/null
- result=$?
- if test $result = 0; then
- ac_path_to_include=""
- else
- ac_path_to_include=" -I$1"
- fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Path to link, already defined
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(WX_LINK_PATH_EXIST,
-[
- echo "$2" | grep "\-L$1" > /dev/null
- result=$?
- if test $result = 0; then
- ac_path_to_link=""
- else
- ac_path_to_link=" -L$1"
- fi
-])
-
-dnl ===========================================================================
-dnl C++ features test
-dnl ===========================================================================
-
-dnl ---------------------------------------------------------------------------
-dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
-dnl or only the old <iostream.h> one - it may be generally assumed that if
-dnl <iostream> exists, the other "new" headers (without .h) exist too.
-dnl
-dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_CPP_NEW_HEADERS,
-[
- if test "$cross_compiling" = "yes"; then
- ifelse([$2], , :, [$2])
- else
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- AC_CHECK_HEADERS(iostream)
-
- if test "$ac_cv_header_iostream" = "yes" ; then
- ifelse([$1], , :, [$1])
- else
- ifelse([$2], , :, [$2])
- fi
-
- AC_LANG_RESTORE
- fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
-dnl
-dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_CPP_BOOL,
-[
- AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- AC_TRY_COMPILE(
- [
- ],
- [
- bool b = true;
-
- return 0;
- ],
- [
- wx_cv_cpp_bool=yes
- ],
- [
- wx_cv_cpp_bool=no
- ]
- )
-
- AC_LANG_RESTORE
- ])
-
- if test "$wx_cv_cpp_bool" = "yes"; then
- AC_DEFINE(HAVE_BOOL)
- fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_C_BIGENDIAN,
-[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
-[ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/param.h>], [
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/param.h>], [
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
-if test $ac_cv_c_bigendian = unknown; then
-AC_TRY_RUN([main () {
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long l;
- char c[sizeof (long)];
- } u;
- u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
-}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes, ac_cv_c_bigendian=unknown)
-fi])
-if test $ac_cv_c_bigendian = unknown; then
- AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
-fi
-if test $ac_cv_c_bigendian = yes; then
- AC_DEFINE(WORDS_BIGENDIAN)
-fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_ARG_CACHE_INIT,
- [
- wx_arg_cache_file="configarg.cache"
- echo "loading argument cache $wx_arg_cache_file"
- rm -f ${wx_arg_cache_file}.tmp
- touch ${wx_arg_cache_file}.tmp
- touch ${wx_arg_cache_file}
- ])
-
-AC_DEFUN(WX_ARG_CACHE_FLUSH,
- [
- echo "saving argument cache $wx_arg_cache_file"
- mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
- ])
-
-dnl this macro checks for a three-valued command line --with argument:
-dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
-dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
-AC_DEFUN(WX_ARG_SYS_WITH,
- [
- AC_MSG_CHECKING([for --with-$1])
- no_cache=0
- AC_ARG_WITH($1, [$2],
- [
- if test "$withval" = yes; then
- ac_cv_use_$1='$3=yes'
- elif test "$withval" = no; then
- ac_cv_use_$1='$3=no'
- elif test "$withval" = sys; then
- ac_cv_use_$1='$3=sys'
- elif test "$withval" = builtin; then
- ac_cv_use_$1='$3=builtin'
- else
- AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
- fi
- ],
- [
- LINE=`grep "$3" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_$1='$3='$DEFAULT_$3
- ])
-
- eval "$ac_cv_use_$1"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$$3" = yes; then
- AC_MSG_RESULT(yes)
- elif test "$$3" = no; then
- AC_MSG_RESULT(no)
- elif test "$$3" = sys; then
- AC_MSG_RESULT(system version)
- elif test "$$3" = builtin; then
- AC_MSG_RESULT(builtin version)
- else
- AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
- fi
- ])
-
-dnl this macro checks for a command line argument and caches the result
-dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
-AC_DEFUN(WX_ARG_WITH,
- [
- AC_MSG_CHECKING([for --with-$1])
- no_cache=0
- AC_ARG_WITH($1, [$2],
- [
- if test "$withval" = yes; then
- ac_cv_use_$1='$3=yes'
- else
- ac_cv_use_$1='$3=no'
- fi
- ],
- [
- LINE=`grep "$3" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_$1='$3='$DEFAULT_$3
- ])
-
- eval "$ac_cv_use_$1"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$$3" = yes; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- ])
-
-dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
-dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
-AC_DEFUN(WX_ARG_ENABLE,
- [
- AC_MSG_CHECKING([for --enable-$1])
- no_cache=0
- AC_ARG_ENABLE($1, [$2],
- [
- if test "$enableval" = yes; then
- ac_cv_use_$1='$3=yes'
- else
- ac_cv_use_$1='$3=no'
- fi
- ],
- [
- LINE=`grep "$3" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_$1='$3='$DEFAULT_$3
- ])
-
- eval "$ac_cv_use_$1"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$$3" = yes; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- ])
-
dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
dnl the file passed to AC_INIT should be specific to our package
-AC_INIT(wx-config.in)
+AC_INIT([wx-config.in])
dnl sets build, host, target variables and the same with _alias
AC_CANONICAL_SYSTEM
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=2
+WX_RELEASE_NUMBER=3
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
-WX_CURRENT=1
+WX_CURRENT=2
WX_REVISION=0
WX_AGE=0
dnl assume Unix
USE_UNIX=1
USE_WIN32=0
+USE_DOS=0
USE_BEOS=0
USE_MAC=0
dnl than checking it during run-time
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+dnl the additional define needed for MT programs
+CPP_MT_FLAG=-D_REENTRANT
+
dnl the list of all available toolkits
dnl
dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
+ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE"
dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
dnl which are either yes or no
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_MGL=0
+DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_PM=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_MGL=0
+DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_PM=0
*-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
+ CPP_MT_FLAG=-D_THREAD_SAFE
AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
+ *-pc-msdosdjgpp )
+ USE_UNIX=0
+ USE_DOS=1
+ AC_DEFINE(__DOS__)
+ PROGRAM_EXT=".exe"
+ DEFAULT_DEFAULT_wxUSE_MGL=1
+ DEFAULT_DEFAULT_wxUSE_SHARED=0
+ ;;
+
*-pc-os2_emx | *-pc-os2-emx )
AC_DEFINE(__EMX__)
PROGRAM_EXT=".exe"
dnl PowerPC Darwin based distributions (including Mac OS X)
USE_BSD=1
USE_DARWIN=1
+ CPP_MT_FLAG=
SO_SUFFIX=dylib
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
dnl check for glibc version
if test "$USE_LINUX" = 1; then
- AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,
+ AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,[
AC_TRY_COMPILE([#include <features.h>],
[
#if !__GLIBC_PREREQ(2, 1)
wx_lib_glibc21=no
]
)
- )
+ ])
if test "$wx_lib_glibc21" = "yes"; then
AC_DEFINE(wxHAVE_GLIBC2)
fi
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=yes
+ DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=no
DEFAULT_wxUSE_LOGGUI=no
+ DEFAULT_wxUSE_LOGDIALOG=no
DEFAULT_wxUSE_GUI=yes
DEFAULT_wxUSE_CONTROLS=no
DEFAULT_wxUSE_STREAMS=no
DEFAULT_wxUSE_SOCKETS=no
DEFAULT_wxUSE_DIALUP_MANAGER=no
- DEFAULT_wxUSE_SERIAL=no
DEFAULT_wxUSE_JOYSTICK=no
DEFAULT_wxUSE_DYNLIB_CLASS=no
+ DEFAULT_wxUSE_DYNAMIC_LOADER=no
DEFAULT_wxUSE_LONGLONG=no
DEFAULT_wxUSE_GEOMETRY=no
DEFAULT_wxUSE_TREELAYOUT=no
DEFAULT_wxUSE_METAFILE=no
DEFAULT_wxUSE_MIMETYPE=no
- DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
-
+ DEFAULT_wxUSE_SYSTEM_OPTIONS=no
+ DEFAULT_wxUSE_PROTOCOL=no
+ DEFAULT_wxUSE_PROTOCOL_HTTP=no
+ DEFAULT_wxUSE_PROTOCOL_FTP=no
+ DEFAULT_wxUSE_PROTOCOL_FILE=no
+ DEFAULT_wxUSE_URL=no
+
DEFAULT_wxUSE_COMMONDLGS=no
DEFAULT_wxUSE_CHOICEDLG=no
DEFAULT_wxUSE_COLOURDLG=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=no
DEFAULT_wxUSE_GIF=no
DEFAULT_wxUSE_PCX=no
DEFAULT_wxUSE_PNM=no
+ DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_XPM=no
+ DEFAULT_wxUSE_ICO_CUR=no
else
DEFAULT_wxUSE_UNIVERSAL=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=yes
+ DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=yes
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=yes
DEFAULT_wxUSE_LOGGUI=yes
+ DEFAULT_wxUSE_LOGDIALOG=yes
DEFAULT_wxUSE_GUI=yes
DEFAULT_wxUSE_STREAMS=yes
DEFAULT_wxUSE_SOCKETS=yes
DEFAULT_wxUSE_DIALUP_MANAGER=yes
- DEFAULT_wxUSE_SERIAL=yes
DEFAULT_wxUSE_JOYSTICK=yes
DEFAULT_wxUSE_DYNLIB_CLASS=yes
+ DEFAULT_wxUSE_DYNAMIC_LOADER=no
DEFAULT_wxUSE_LONGLONG=yes
DEFAULT_wxUSE_GEOMETRY=yes
DEFAULT_wxUSE_METAFILE=yes
DEFAULT_wxUSE_MIMETYPE=yes
DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
+ DEFAULT_wxUSE_PROTOCOL=yes
+ DEFAULT_wxUSE_PROTOCOL_HTTP=yes
+ DEFAULT_wxUSE_PROTOCOL_FTP=yes
+ DEFAULT_wxUSE_PROTOCOL_FILE=yes
+ DEFAULT_wxUSE_URL=yes
DEFAULT_wxUSE_COMMONDLGS=yes
DEFAULT_wxUSE_CHOICEDLG=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=yes
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=yes
DEFAULT_wxUSE_IMAGE=yes
DEFAULT_wxUSE_GIF=yes
DEFAULT_wxUSE_PCX=yes
+ DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_PNM=yes
DEFAULT_wxUSE_XPM=yes
+ DEFAULT_wxUSE_ICO_CUR=yes
fi
dnl WX_ARG_WITH should be used to select whether an external package will be
AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1])
AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mgl, [ --with-mgl use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
AC_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
fi
dnl for GUI only
-WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
+WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx class], wxUSE_REGEX)
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL)
WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG)
+WX_ARG_ENABLE(protocols, [ --enable-protocols use wxProtocol and derived classes], wxUSE_PROTOCOL)
+WX_ARG_ENABLE(ftp, [ --enable-ftp use wxFTP (requires wxProtocol], wxUSE_PROTOCOL_FTP)
+WX_ARG_ENABLE(http, [ --enable-http use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
+WX_ARG_ENABLE(fileproto, [ --enable-fileproto use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS)
WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC)
WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE)
WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION)
WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
+WX_ARG_ENABLE(dynamicloader, [ --enable-dynamicloader use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG)
WX_ARG_ENABLE(geometry, [ --enable-geometry use geometry class], wxUSE_GEOMETRY)
WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG)
WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE)
WX_ARG_ENABLE(fontmap, [ --enable-fontmap use font encodings conversion classes], wxUSE_FONTMAP)
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
+WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (win32 only)], wxUSE_UNICODE_MSLU)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
WX_ARG_ENABLE(filesystem, [ --enable-filesystem use virtual file systems classes], wxUSE_FILESYSTEM)
WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
-WX_ARG_ENABLE(mimetype, [ --enable-mimetypes use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE)
WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
+WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL)
+WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL)
+WX_ARG_ENABLE(protocol_http, [ --enable-protocol-http HTTP support in wxProtocol], wxUSE_PROTOCOL_HTTP)
+WX_ARG_ENABLE(protocol_ftp, [ --enable-protocol-ftp FTP support in wxProtocol], wxUSE_PROTOCOL_FTP)
+WX_ARG_ENABLE(protocol_file, [ --enable-protocol-file FILE support in wxProtocol], wxUSE_PROTOCOL_FILE)
+
+
dnl ---------------------------------------------------------------------------
dnl "big" options (i.e. those which change a lot of things throughout the library)
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(threads, [ --enable-threads use threads], wxUSE_THREADS)
-WX_ARG_ENABLE(serial, [ --enable-serial use class serialization], wxUSE_SERIAL)
if test "$wxUSE_GUI" = "yes"; then
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
WX_ARG_ENABLE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI)
WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW)
+WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG)
dnl ---------------------------------------------------------------------------
dnl PostScript options
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
fi
WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
WX_ARG_ENABLE(tbarnative, [ --enable-tbarnative use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
WX_ARG_ENABLE(tbarsmpl, [ --enable-tbarsmpl use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
WX_ARG_ENABLE(treectrl, [ --enable-treectrl use wxTreeCtrl class], wxUSE_TREECTRL)
+WX_ARG_ENABLE(tipwindow, [ --enable-tipwindow use wxTipWindow class], wxUSE_TIPWINDOW)
WX_ARG_ENABLE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN)
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(choicedlg, [ --enable-choicedlg use wxChoiceDialog], wxUSE_CHOICEDLG)
WX_ARG_ENABLE(coldlg, [ --enable-coldlg use wxColourDialog], wxUSE_COLOURDLG)
WX_ARG_ENABLE(filedlg, [ --enable-filedlg use wxFileDialog], wxUSE_FILEDLG)
-WX_ARG_ENABLE(filedlg, [ --enable-finddlg use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
+WX_ARG_ENABLE(finddlg, [ --enable-finddlg use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
WX_ARG_ENABLE(fontdlg, [ --enable-fontdlg use wxFontDialog], wxUSE_FONTDLG)
WX_ARG_ENABLE(dirdlg, [ --enable-dirdlg use wxDirDialog], wxUSE_DIRDLG)
WX_ARG_ENABLE(msgdlg, [ --enable-msgdlg use wxMessageDialog], wxUSE_MSGDLG)
WX_ARG_ENABLE(image, [ --enable-image use wxImage class], wxUSE_IMAGE)
WX_ARG_ENABLE(gif, [ --enable-gif use gif images (GIF file format)], wxUSE_GIF)
WX_ARG_ENABLE(pcx, [ --enable-pcx use pcx images (PCX file format)], wxUSE_PCX)
+WX_ARG_ENABLE(iff, [ --enable-iff use iff images (IFF file format)], wxUSE_IFF)
WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(pnm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(xpm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR formats], wxUSE_ICO_CUR)
fi
dnl for GUI only
dnl we suppose that expr is available (maybe there is a better way to do
dnl this? what about using ALL_TOOLKITS? TODO)
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \
- + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}`
+ + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0}`
dnl Allow wxUSE_PM only for OS/2 with EMX.
dnl Path separator; ':' for unix.
dnl cross-compiling support: we're cross compiling if the build system is
dnl different from the target one (assume host and target be always the same)
if test "$build" != "$host" ; then
- if test "$USE_WIN32" = 1 ; then
+ if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
dnl defines STRIP as strip or nothing if not found
AC_CHECK_PROG(STRIP, strip, strip, true)
+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); then
+ wx_cv_prog_makeisgnu="yes"
+ else
+ wx_cv_prog_makeisgnu="no"
+ fi
+])
+
+if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
+ IF_GNU_MAKE=""
+else
+ IF_GNU_MAKE="#"
+fi
+
+AC_SUBST(IF_GNU_MAKE)
+
+dnl we don't need to check for VPATH support in GNU make - it does have it
+if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
dnl check if VPATH works
-AC_MSG_CHECKING(make for VPATH support)
+AC_CACHE_CHECK([if make supports VPATH], wx_cv_prog_makevpath, [
dnl create Makefile
cat - << EOF > confMake
check : file
rm -f sub/file check final_file confMake
rmdir sub
if test "$RESULT" = 0; then
- AC_MSG_RESULT(yes)
+ wx_cv_prog_makevpath="yes"
else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+ wx_cv_prog_makevpath="no"
+fi
+])
+
+if test "x$wx_cv_prog_makevpath" != "xyes"; then
+AC_MSG_ERROR([
You need a make-utility that is able to use the variable
VPATH correctly.
If your version of make does not support VPATH correctly,
Also please do remember to use gmake in this case every time
you are trying to compile.
])
-fi
+fi dnl make without VPATH
+fi dnl not GNU make
dnl YACC checks
dnl defines YACC with the appropriate command
PNG_LINK=
if test "$wxUSE_LIBPNG" != "no" ; then
AC_DEFINE(wxUSE_LIBPNG)
+
+ if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
+ AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
+ wxUSE_LIBPNG=sys
+ fi
dnl for the check below to have a chance to succeed, we must already have
- dnl libz somewhere
- if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+ dnl libz somewhere (don't do this when bulding wxMGL since its libpng
+ dnl doesn't depend on zlib)
+ if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
wxUSE_LIBPNG=builtin
fi
- if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
- AC_CHECK_HEADER(png.h,
- AC_CHECK_LIB(png, png_check_sig,
- PNG_LINK=" -lpng",
- ,
- [-lz -lm])
- )
+ if test "$wxUSE_MGL" != 1 ; then
+ dnl Don't check for libpng when building wxMGL, libmgl contains it
+ if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+ AC_CHECK_HEADER(png.h,
+ AC_CHECK_LIB(png, png_check_sig,
+ PNG_LINK=" -lpng",
+ ,
+ [-lz -lm])
+ )
- if test "x$PNG_LINK" = "x" ; then
- if test "$wxUSE_LIBPNG" = "sys" ; then
- AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version])
+ if test "x$PNG_LINK" = "x" ; then
+ if test "$wxUSE_LIBPNG" = "sys" ; then
+ AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version])
+ else
+ AC_MSG_WARN([system png library not found, will use built-in instead])
+ wxUSE_LIBPNG=builtin
+ fi
else
- AC_MSG_WARN([system png library not found, will use built-in instead])
- wxUSE_LIBPNG=builtin
+ dnl we are using the system library
+ wxUSE_LIBPNG=yes
fi
- else
- dnl we are using the system library
- wxUSE_LIBPNG=yes
fi
fi
if test "$wxUSE_LIBJPEG" != "no" ; then
AC_DEFINE(wxUSE_LIBJPEG)
- if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
- dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
- dnl HAVE_STDLIB_H which are already defined and this provokes
- dnl a compiler warning which configure considers as an error...
- AC_MSG_CHECKING(for jpeglib.h)
- AC_CACHE_VAL(ac_cv_header_jpeglib_h,
- AC_TRY_COMPILE(
- [
- #undef HAVE_STDLIB_H
- #include <stdio.h>
- #include <jpeglib.h>
- ],
- [
- ],
- ac_cv_header_jpeglib_h=yes,
- ac_cv_header_jpeglib_h=no
+ if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
+ AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
+ wxUSE_LIBJPEG=sys
+ fi
+
+ if test "$wxUSE_MGL" != 1 ; then
+ dnl Don't check for libjpeg when building wxMGL, libmgl contains it
+ if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+ dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+ dnl HAVE_STDLIB_H which are already defined and this provokes
+ dnl a compiler warning which configure considers as an error...
+ AC_MSG_CHECKING(for jpeglib.h)
+ AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+ AC_TRY_COMPILE(
+ [
+ #undef HAVE_STDLIB_H
+ #include <stdio.h>
+ #include <jpeglib.h>
+ ],
+ [
+ ],
+ ac_cv_header_jpeglib_h=yes,
+ ac_cv_header_jpeglib_h=no
+ )
)
- )
- AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+ AC_MSG_RESULT($ac_cv_header_jpeglib_h)
- if test "$ac_cv_header_jpeglib_h" = "yes"; then
- AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
- fi
+ if test "$ac_cv_header_jpeglib_h" = "yes"; then
+ AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+ fi
- if test "x$JPEG_LINK" = "x" ; then
- if test "$wxUSE_LIBJPEG" = "sys" ; then
- AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
+ if test "x$JPEG_LINK" = "x" ; then
+ if test "$wxUSE_LIBJPEG" = "sys" ; then
+ AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
+ else
+ AC_MSG_WARN([system jpeg library not found, will use built-in instead])
+ wxUSE_LIBJPEG=builtin
+ fi
else
- AC_MSG_WARN([system jpeg library not found, will use built-in instead])
- wxUSE_LIBJPEG=builtin
+ dnl we are using the system library
+ wxUSE_LIBJPEG=sys
fi
- else
- dnl we are using the system library
- wxUSE_LIBJPEG=sys
fi
fi
dnl add extra odbc libs if we have compiled in odbc
if test "$wxUSE_ODBC" = "yes" ; then
- LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
+ LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
fi
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
gtk_version_cached=0
AC_MSG_RESULT()
+ dnl we must link against lgthread unless the user
+ dnl used --disable-threads
+ GTK_MODULES=
+ if test "$wxUSE_THREADS" = "yes"; then
+ GTK_MODULES=gthread
+ fi
+
wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; then
- AM_PATH_GTK_2_0(1.3.1, wx_cv_lib_gtk=2.0, gthread)
+ AM_PATH_GTK_2_0(1.3.1, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
fi
if test -z "$wx_cv_lib_gtk"; then
- AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7)
+ AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
fi
if test -z "$wx_cv_lib_gtk"; then
- AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3)
+ AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
fi
if test -z "$wx_cv_lib_gtk"; then
fi
if test "$wxUSE_MGL" = 1; then
- dnl FIXME_MGL - test for MGL's variants for freebsd etc.
-
AC_MSG_CHECKING(for SciTech MGL library)
if test "x$MGL_ROOT" = x ; then
AC_MSG_RESULT(not found)
AC_MSG_RESULT($MGL_ROOT)
fi
- mgl_os=linux/gcc/glibc
+ dnl Find MGL library that we want
+ dnl FIXME_MGL - test for MGL variants for freebsd etc.
+ case "${host}" in
+ *-*-linux* )
+ mgl_os=linux/gcc/glibc
+ ;;
+ *-pc-msdosdjgpp )
+ mgl_os=dos32/dj2
+ ;;
+ *)
+ AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
+ esac
+
mgl_lib_type=""
if test "$wxUSE_DEBUG_FLAG" = yes ; then
GUIDIST=MGL_DIST
fi
+ if test "$wxUSE_MICROWIN" = 1; then
+ AC_MSG_CHECKING(for MicroWindows)
+ if test "x$MICROWINDOWS" = x ; then
+ AC_MSG_RESULT(not found)
+ AC_MSG_ERROR([Cannot find MicroWindows library. Make sure MICROWINDOWS is set.])
+ else
+ AC_MSG_RESULT($MICROWINDOWS)
+ fi
+
+ if test -f $MICROWINDOWS/lib/libmwin.a; then
+ AC_MSG_RESULT(MicroWindows' libraries found.)
+ else
+ AC_MSG_ERROR([Cannot find MicroWindows libraries, make sure they are compiled.])
+ fi
+
+ TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
+ GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib"
+
+ AFMINSTALL=afminstall
+ TOOLKIT=MICROWIN
+ GUIDIST=MICROWIN_DIST
+
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
+ fi
+
if test "$wxUSE_WINE" = 1; then
AC_CHECK_HEADER(windows.h, [],
[
CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
CFLAGS="$CFLAGS -fpascal-strings"
CXXFLAGS="$CXXFLAGS -fpascal-strings"
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
TOOLKIT=MAC
if test "$wxUSE_UNIVERSAL" = "yes"; then
ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+
+ dnl ALL_SOURCES and ALL_HEADERS shouldn't include really all sources
+ dnl and headers as some/most are not needed for wxUniv but I don't
+ dnl have time to add GUI_LOWLEVEL_SOURCES/HEADERS stuff now (TODO!)
+ ALL_SOURCES="\$(ALL_SOURCES) \${UNIV_SOURCES}"
+ ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
+
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
WIDGET_SET=univ
else
ALL_OBJECTS="\$(GUIOBJS)"
+ ALL_SOURCES="\$(ALL_SOURCES)"
+ ALL_HEADERS="\$(ALL_HEADERS)"
fi
ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
- if test "$TOOLKIT" != "MSW"; then
+ if test "$TOOLKIT" != "MSW" -a "$USE_DOS" != 1; then
ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
fi
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ if test "$ac_path_to_link" = " -L/usr/lib" ; then
+ LDFLAGS_GL="$LDFLAGS"
+ else
+ LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ fi
OPENGL_LIBS="-lGL -lGLU"
AC_MSG_RESULT([yes])
else
case "${host}" in
*-hp-hpux* )
dnl default settings are good for gcc but not for the native HP-UX
- if test "$GCC" != "yes"; then
+ if test "$GCC" == "yes"; then
+ SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
+ else
dnl no idea why it wants it, but it does
LDFLAGS="$LDFLAGS -L/usr/lib"
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
- SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
+ SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
fi
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- SHARED_LD="$CXX -dynamiclib -o"
+ CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+ CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+ SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC"
;;
WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
- AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+ AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
dnl defines HAVE_STDLIB_H
AC_CHECK_HEADERS(stdlib.h)
+dnl defines HAVE_MALLOC_H
+AC_CHECK_HEADERS(malloc.h)
dnl defines HAVE_UNISTD_H
AC_CHECK_HEADERS(unistd.h)
dnl defines HAVE_WCHAR_H
AC_CHECK_HEADERS(wctype.h)
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
-dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
-AC_CHECK_HEADERS(iconv.h)
dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
AC_CHECK_HEADERS(langinfo.h)
dnl check for vsscanf() and vsnprintf() - on some platforms (Linux, glibc
dnl 2.1.1 for the first one, HP-UX for the second) it's available in the
-dnl library but the prototype is missing, so we can't use AC_CHECK_FUNCS here,
-dnl do it manually
+dnl library but the prototype is missing, so we can't use AC_CHECK_FUNCS() here,
+dnl do it manually. We can't use AC_TRY_COMPILE(), either, because it doesn't
+dnl check if the symbol is available at linking time
-dnl we use AC_TRY_COMPILE() here instead of AC_TRY_RUN() to make the checks
-dnl work for cross-compilation, but AC_TRY_COMPILE() normally only compiles
+dnl we use AC_TRY_LINK() here instead of AC_TRY_RUN() to make the checks
+dnl work for cross-compilation, but AC_TRY_LINK() normally only compiles
dnl one function while we need at least 2 - hence the ugly hack below. To
-dnl understand why it works, remember that AC_TRY_COMPILE() just prepends
+dnl understand why it works, remember that AC_TRY_LINK() just prepends
dnl "int main() {" in the beginning of the code and "; return 0; }" at the
dnl end...
dnl if we fail to find vsnprintf, also try for _vsnprintf as that is what
dnl we'll find under MSW if it exists.
-dnl final note: AC_TRY_COMPILE will only be executed if there is nothing in
+dnl final note: AC_TRY_LINK will only be executed if there is nothing in
dnl the cache so we have to do AC_DEFINE(HAVE_VSNPRINTF) below and not inside
dnl it or the symbol wouldn't be defined for the 2nd and subsequent configure
dnl runs
dnl check for vsnprintf() - a safe version of vsprintf()
AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
[
- AC_TRY_COMPILE([
+ AC_TRY_LINK([
#include <stdio.h>
#include <stdarg.h>
], [
], [
wx_cv_func_vsnprintf=yes
], [
- AC_TRY_COMPILE([
+ AC_TRY_LINK([
#include <stdio.h>
#include <stdarg.h>
], [
if test "$wx_cv_func_vsnprintf" = yes; then
AC_DEFINE(HAVE_VSNPRINTF)
else
- AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+ AC_MSG_WARN(unsafe function vsprintf will be used instead of vsnprintf)
fi
dnl check for vsscanf()
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_CACHE_CHECK([if iconv() takes char**], wx_cv_iconv_takes_char,
-[
- AC_TRY_COMPILE([#include <iconv.h>],
- [
- char **inbuf, **outbuf;
- iconv_t cd;
- size_t insz, outsz;
- iconv(cd, inbuf, &insz, outbuf, &outsz);
- ],
- wx_cv_iconv_takes_char=yes,
- wx_cv_iconv_takes_char=no)
-])
+AM_ICONV
+LIBS="$LIBICONV $LIBS"
AC_LANG_RESTORE
-if test "$wx_cv_iconv_takes_char" = yes ; then
- AC_DEFINE(WX_ICONV_TAKES_CHAR)
-fi
-
dnl check for POSIX signals if we need them
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
dnl check for vfork() (even if it's the same as fork() in modern Unices)
AC_CHECK_FUNCS(vfork)
+dnl check for the function for temp files creation
+AC_CHECK_FUNCS(mkstemp mktemp, break)
+
dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
dnl Linux and *BSD and statvfs() under Solaris
AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then
- AC_MSG_WARN([Threads are not supported under WINE])
+ AC_MSG_WARN([Threads are not supported under WINE... disabled])
wxUSE_THREADS="no"
elif test "$USE_BEOS" = 1; then
- AC_MSG_WARN([BeOS threads are not yet supported])
+ AC_MSG_WARN([BeOS threads are not yet supported... disabled])
wxUSE_THREADS="no"
fi
fi
if test -z "$THREADS_OBJ" ; then
wxUSE_THREADS=no
- AC_MSG_WARN(No thread support on this system)
+ AC_MSG_WARN([No thread support on this system... disabled])
fi
fi
if test "$wxUSE_THREADS" = "yes"; then
AC_DEFINE(wxUSE_THREADS)
- dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
- if test "$USE_DARWIN" != 1; then
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
- fi
+ dnl we must define _REENTRANT or something along these lines for MT code
+ TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS $CPP_MT_FLAG"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
else
if test "$wxUSE_TEXTFILE" = "yes"; then
if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
- AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them)
+ AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
else
AC_DEFINE(wxUSE_TEXTFILE)
fi
if test "$wxUSE_CONFIG" = "yes" ; then
if test "$wxUSE_TEXTFILE" != "yes"; then
- AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
+ AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
else
AC_DEFINE(wxUSE_CONFIG)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
if test "$wxUSE_INTL" = "yes" ; then
if test "$wxUSE_FILE" != "yes"; then
- AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
+ AC_MSG_WARN(I18n code requires wxFile... disabled)
else
AC_DEFINE(wxUSE_INTL)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
if test "$wxUSE_LOGWINDOW" = "yes"; then
AC_DEFINE(wxUSE_LOGWINDOW)
fi
+
+ if test "$wxUSE_LOGDIALOG" = "yes"; then
+ AC_DEFINE(wxUSE_LOG_DIALOG)
+ fi
fi
if test "$wxUSE_LONGLONG" = "yes"; then
[
wx_cv_var_timezone=__timezone
],
- AC_MSG_ERROR(no timezone variable)
+ [
+ if test "$USE_DOS" = 0 ; then
+ AC_MSG_ERROR(no timezone variable)
+ fi
+ ]
)
]
)
)
dnl as we want $wx_cv_var_timezone to be expanded, use AC_DEFINE_UNQUOTED
- AC_DEFINE_UNQUOTED(WX_TIMEZONE, $wx_cv_var_timezone)
+ if test "x$wx_cv_var_timezone" != x ; then
+ AC_DEFINE_UNQUOTED(WX_TIMEZONE, $wx_cv_var_timezone)
+ fi
dnl check for localtime (it's POSIX, but the check can do no harm...)
AC_CHECK_FUNCS(localtime)
if test "$wxUSE_GUI" = "yes"; then
+ if test "$TOOLKIT" = "MAC"; then
+ AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
+ wxUSE_JOYSTICK=no
+ fi
+ if test "$TOOLKIT" = "MOTIF"; then
+ AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
+ wxUSE_JOYSTICK=no
+ fi
+
dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then
AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no
- AC_MSG_WARN(Joystick not supported by this system, disabled)
+ AC_MSG_WARN(Joystick not supported by this system... disabled)
fi
fi
fi
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
- if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
+ if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
if test "$USE_DARWIN" = 1; then
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
HAVE_DL_FUNCS=1
if test "$HAVE_SHL_FUNCS" = 0; then
if test "$USE_UNIX" = 1; then
AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
+ wxUSE_DYNAMIC_LOADER=no
wxUSE_DYNLIB_CLASS=no
else
AC_MSG_WARN([Assuming wxLibrary class works on this platform])
fi
fi
-if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
+ AC_DEFINE(wxUSE_DYNAMIC_LOADER)
+elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
AC_DEFINE(wxUSE_DYNLIB_CLASS)
-else
- wxUSE_ODBC=no
- wxUSE_SERIAL=no
fi
dnl ---------------------------------------------------------------------------
if test "$wxUSE_UNICODE" = "yes" ; then
AC_DEFINE(wxUSE_UNICODE)
+
+ if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
+ AC_CHECK_LIB(unicows,main,
+ [
+ AC_DEFINE(wxUSE_UNICODE_MSLU)
+ ],
+ [
+ AC_MSG_WARN([Compiler doesn't support MSLU (libunicows.a), disabled.
+ Applications will only run on Windows NT/2000/XP!])
+ wxUSE_UNICODE_MSLU=no
+ ])
+ fi
fi
if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
fi
-dnl ----------------------------------------------------------------
-dnl serialization support
-dnl ----------------------------------------------------------------
-
-if test "$wxUSE_SERIAL" = "yes" ; then
- AC_DEFINE(wxUSE_SERIAL)
-fi
dnl ----------------------------------------------------------------
dnl iODBC support
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
+ AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
wxUSE_MDI_ARCHITECTURE=no
fi
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
- AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
+ AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
fi
AC_DEFINE(wxUSE_IPC)
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
- AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
+ AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_WARN([Drag and drop is not yet supported under Motif])
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$wxUSE_MAC" = 1; then
- AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
+ AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
+ if test "$wxUSE_MAC" = 1; then
+ AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
+ wxUSE_TOGGLEBTN=no
+ fi
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_WARN(wxTooltip not supported yet under Motif)
+ AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
else
if test "$wxUSE_WINE" = 1; then
- AC_MSG_WARN(wxTooltip not supported under WINE)
+ AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
else
- AC_DEFINE(wxUSE_TOOLTIPS)
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+ else
+ AC_DEFINE(wxUSE_TOOLTIPS)
+ fi
fi
fi
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1; then
- AC_MSG_WARN(Popup window is not yet supported under Mac OS)
+ AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else
- AC_DEFINE(wxUSE_POPUPWIN)
- USES_CONTROLS=1
+ if test "$wxUSE_MOTIF" = 1; then
+ AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+ else
+ AC_DEFINE(wxUSE_POPUPWIN)
+
+ USES_CONTROLS=1
+ fi
fi
fi
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+ AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
if test "$USES_CONTROLS" = 1; then
AC_DEFINE(wxUSE_CONTROLS)
fi
AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
fi
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ AC_MSG_WARN(Protocol classes require sockets... disabled)
+ wxUSE_PROTOCOL=no
+ fi
+
+ if test "$wxUSE_PROTOCOL" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL)
+
+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_HTTP)
+ fi
+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_FTP)
+ fi
+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_FILE)
+ fi
+ fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+ if test "$wxUSE_PROTOCOL" != "yes"; then
+ AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
+ wxUSE_URL=no
+ fi
+ if test "$wxUSE_URL" = "yes"; then
+ AC_DEFINE(wxUSE_URL)
+ fi
+fi
+
if test "$wxUSE_MINIFRAME" = "yes"; then
AC_DEFINE(wxUSE_MINIFRAME)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
AC_DEFINE(wxUSE_PCX)
fi
+if test "$wxUSE_IFF" = "yes" ; then
+ AC_DEFINE(wxUSE_IFF)
+fi
+
if test "$wxUSE_PNM" = "yes" ; then
AC_DEFINE(wxUSE_PNM)
fi
AC_DEFINE(wxUSE_XPM)
fi
+if test "$wxUSE_ICO_CUR" = "yes" ; then
+ AC_DEFINE(wxUSE_ICO_CUR)
+fi
+
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+ dnl Must be done this late because -lunicows must be before all the other libs
+ LIBS=" -lunicows $LIBS"
+fi
+
dnl ---------------------------------------------------------------------------
dnl common dialog
dnl ---------------------------------------------------------------------------
fi
fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
AC_SUBST(WXCONFIG_INCLUDE)
-dnl what to compile
+dnl the list of files to compile/install
AC_SUBST(ALL_OBJECTS)
+AC_SUBST(ALL_HEADERS)
+AC_SUBST(ALL_SOURCES)
dnl distribution vars
AC_SUBST(GUIDIST)
AC_SUBST(MAKEINFO)
AC_SUBST(INSTALL_LIBRARY)
-
-
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
-dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
+dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
dnl - and we do use it)
AC_PROG_MAKE_SET
dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
dnl samples and the only way to do it is, again, use the cache
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_libtype=$WX_TARGET_LIBRARY_TYPE
dnl we need to export them because passing them through cache won't
dnl work when cache=/dev/null (which is default for autoconf 2.50)
- export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+ 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
AC_CONFIG_SUBDIRS(demos samples utils contrib)
fi
projects / wxWidgets.git / blobdiff