dnl initialization
dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [2.5.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.7.0], [wx-dev@lists.wxwidgets.org])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
dnl When making releases do:
dnl
dnl wx_release_number += 1
-dnl
-dnl ..and update WX_CURRENT, WX_REVISION and WX_AGE according to the
-dnl following rules:
-dnl
-dnl If any changes have been made to the public interface, that is if any
-dnl exported class, method, global or global type has been added, removed
-dnl or changed in any way, then do: WX_CURRENT += 1
-dnl
-dnl If source changes have been made that *do not* alter the public
-dnl interface then do: WX_REVISION += 1
-dnl If WX_CURRENT was incremented (as above) instead do: WX_REVISION = 0
-dnl
-dnl If any public interface was added, do: WX_AGE += 1
-dnl If any public interface was removed (or altered in a way effectively
-dnl removing the previous definition), instead do: WX_AGE = 0
-dnl
-dnl When the major or minor version numbers are incremented, all the above
-dnl variables should be reset to 0.
-dnl
-dnl The resulting library name will be of the form:
-dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
wx_major_version_number=2
-wx_minor_version_number=5
-wx_release_number=3
-wx_subrelease_number=3
+wx_minor_version_number=7
+wx_release_number=0
+wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
-WX_CURRENT=3
-WX_REVISION=0
-WX_AGE=3
dnl ------------------------------------------------------------------------
SAMPLES_RPATH_FLAG=
SAMPLES_RPATH_POSTLINK=
+DEFAULT_STD_FLAG=yes
+
dnl to support a new system, you need to add its canonical name (as determined
dnl by config.sub or specified by the configure command line) to this "case"
dnl and also define the shared library flags below - search for
NEEDS_D_REENTRANT_FOR_R_FUNCS=1
SO_SUFFIX=sl
AC_DEFINE(__HPUX__)
+
+ dnl many standard declarations in HP-UX headers are only included if either
+ dnl _HPUX_SOURCE is defined, see stdsyms(5)
+ CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS"
;;
*-*-linux* )
USE_LINUX=1
AC_DEFINE(__NETBSD__)
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+
+ dnl some standard declarations in NetBSD headers are only included if
+ dnl _NETBSD_SOURCE and _LIBC are defined, e.g. getservbyname_r in netdb.h
+ CPPFLAGS="-D_NETBSD_SOURCE -D_LIBC $CPPFLAGS"
;;
*-*-osf* )
USE_ALPHA=1
dnl USE_UNIX must be set and not USE_WIN32
SO_SUFFIX=dll
PROGRAM_EXT=".exe"
- RESCOMP=windres
DEFAULT_DEFAULT_wxUSE_MSW=1
+ DEFAULT_STD_FLAG=no
;;
*-pc-msdosdjgpp )
AC_DEFINE(__DOS__)
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_MGL=1
- dnl DJGPP needs explicit -lstdc++ for some reason (VS: mayb some versions only?)
- LIBS="$LIBS -lstdc++"
;;
*-pc-os2_emx | *-pc-os2-emx )
done
export PATH="$ac_TEMP_PATH"
unset ac_TEMP_PATH
+ DEFAULT_STD_FLAG=no
;;
- powerpc-*-darwin* )
- dnl PowerPC Darwin based distributions (including Mac OS X)
+ *-*-darwin* )
+ dnl Darwin based distributions (including Mac OS X)
USE_BSD=1
USE_DARWIN=1
SO_SUFFIX=dylib
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
- AC_DEFINE(__POWERPC__)
AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_STD_FLAG=no
;;
powerpc-apple-macos* )
dnl Classic Mac OS (< X)
dnl AC_DEFINE(TARGET_CARBON)
dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_STD_FLAG=no
;;
*-*-beos* )
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_UNIVERSAL_BINARY=no
DEFAULT_wxUSE_RPATH=yes
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBGNOMEPRINT=no
+ DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+ DEFAULT_wxUSE_STACKWALKER=no
+ DEFAULT_wxUSE_DEBUGREPORT=no
DEFAULT_wxUSE_SNGLINST_CHECKER=no
DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_STD_STRING=no
DEFAULT_wxUSE_CMDLINE_PARSER=no
DEFAULT_wxUSE_DATETIME=no
DEFAULT_wxUSE_TIMER=no
DEFAULT_wxUSE_STOPWATCH=no
DEFAULT_wxUSE_FILE=no
DEFAULT_wxUSE_FFILE=no
+ DEFAULT_wxUSE_STDPATHS=no
DEFAULT_wxUSE_TEXTBUFFER=no
DEFAULT_wxUSE_TEXTFILE=no
DEFAULT_wxUSE_SOUND=no
- DEFAULT_wxUSE_MEDIACTRL=no
- DEFAULT_wxUSE_DIRECTSHOW=no
+ DEFAULT_wxUSE_MEDIACTRL=no
+ DEFAULT_wxUSE_GSTREAMER8=no
DEFAULT_wxUSE_INTL=no
DEFAULT_wxUSE_CONFIG=no
DEFAULT_wxUSE_FONTMAP=no
DEFAULT_wxUSE_DRAG_AND_DROP=no
DEFAULT_wxUSE_DRAGIMAGE=no
DEFAULT_wxUSE_SPLINES=no
+ DEFAULT_wxUSE_MOUSEWHEEL=no
DEFAULT_wxUSE_MDI=no
DEFAULT_wxUSE_MDI_ARCHITECTURE=no
DEFAULT_wxUSE_MENUS=no
DEFAULT_wxUSE_MINIFRAME=no
DEFAULT_wxUSE_HTML=no
+ DEFAULT_wxUSE_RICHTEXT=no
DEFAULT_wxUSE_XRC=no
DEFAULT_wxUSE_WEBKIT=no
DEFAULT_wxUSE_FILESYSTEM=no
DEFAULT_wxUSE_FS_INET=no
DEFAULT_wxUSE_FS_ZIP=no
DEFAULT_wxUSE_BUSYINFO=no
+ DEFAULT_wxUSE_ARCHIVE_STREAMS=no
DEFAULT_wxUSE_ZIPSTREAM=no
DEFAULT_wxUSE_VALIDATORS=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_STATLINE=no
DEFAULT_wxUSE_STATTEXT=no
DEFAULT_wxUSE_STATUSBAR=yes
- DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TAB_DIALOG=no
DEFAULT_wxUSE_TEXTCTRL=no
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
+ DEFAULT_wxUSE_TREEBOOK=no
+ DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
DEFAULT_wxUSE_TIPWINDOW=no
DEFAULT_wxUSE_XPM=no
DEFAULT_wxUSE_ICO_CUR=no
DEFAULT_wxUSE_ACCESSIBILITY=no
-
+
DEFAULT_wxUSE_MONOLITHIC=no
DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_UNIVERSAL_BINARY=no
DEFAULT_wxUSE_RPATH=yes
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_LIBMSPACK=yes
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBGNOMEPRINT=no
+ DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+ DEFAULT_wxUSE_STACKWALKER=yes
+ DEFAULT_wxUSE_DEBUGREPORT=yes
DEFAULT_wxUSE_SNGLINST_CHECKER=yes
- DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+ DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_CMDLINE_PARSER=yes
DEFAULT_wxUSE_DATETIME=yes
DEFAULT_wxUSE_TIMER=yes
DEFAULT_wxUSE_STOPWATCH=yes
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_FFILE=yes
+ DEFAULT_wxUSE_STDPATHS=yes
DEFAULT_wxUSE_TEXTBUFFER=yes
DEFAULT_wxUSE_TEXTFILE=yes
DEFAULT_wxUSE_SOUND=yes
DEFAULT_wxUSE_MEDIACTRL=no
- DEFAULT_wxUSE_DIRECTSHOW=no
+ DEFAULT_wxUSE_GSTREAMER8=no
DEFAULT_wxUSE_INTL=yes
DEFAULT_wxUSE_CONFIG=yes
DEFAULT_wxUSE_FONTMAP=yes
DEFAULT_wxUSE_DRAG_AND_DROP=yes
DEFAULT_wxUSE_DRAGIMAGE=yes
DEFAULT_wxUSE_SPLINES=yes
+ DEFAULT_wxUSE_MOUSEWHEEL=yes
DEFAULT_wxUSE_MDI=yes
DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
DEFAULT_wxUSE_MENUS=yes
DEFAULT_wxUSE_MINIFRAME=yes
DEFAULT_wxUSE_HTML=yes
+ DEFAULT_wxUSE_RICHTEXT=yes
DEFAULT_wxUSE_XRC=yes
DEFAULT_wxUSE_WEBKIT=yes
DEFAULT_wxUSE_FILESYSTEM=yes
DEFAULT_wxUSE_FS_INET=yes
DEFAULT_wxUSE_FS_ZIP=yes
DEFAULT_wxUSE_BUSYINFO=yes
+ DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
DEFAULT_wxUSE_ZIPSTREAM=yes
DEFAULT_wxUSE_VALIDATORS=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
DEFAULT_wxUSE_COMBOBOX=yes
+ DEFAULT_wxUSE_DATEPICKCTRL=yes
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_STATLINE=yes
DEFAULT_wxUSE_STATTEXT=yes
DEFAULT_wxUSE_STATUSBAR=yes
- DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TAB_DIALOG=no
DEFAULT_wxUSE_TEXTCTRL=yes
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
+ DEFAULT_wxUSE_TREEBOOK=yes
+ DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
DEFAULT_wxUSE_TIPWINDOW=yes
DEFAULT_wxUSE_XPM=yes
DEFAULT_wxUSE_ICO_CUR=yes
DEFAULT_wxUSE_ACCESSIBILITY=no
-
+
DEFAULT_wxUSE_MONOLITHIC=no
DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
DEFAULT_wxUSE_GTK2=yes
fi
+
dnl WX_ARG_WITH should be used to select whether an external package will be
dnl used or not, to configure compile-time features of this package itself,
dnl use WX_ARG_ENABLE instead
has_toolkit_in_cache=1
eval "DEFAULT_$LINE"
eval "CACHE_$toolkit=1"
+
+ LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
+ if test "x$LINE" != "x" ; then
+ eval "DEFAULT_$LINE"
+ fi
fi
done
WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWidgets as single library], wxUSE_MONOLITHIC)
WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWidgets as loadable components], wxUSE_PLUGINS)
+WX_ARG_WITH(subdirs, [ --without-subdirs don't generate makefiles for samples/demos/...], wxWITH_SUBDIRS, without)
if test "$wxUSE_GUI" = "yes"; then
WX_ARG_ENABLE(universal, [ --enable-universal use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
-AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(cocoa, [ --with-cocoa use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX)
-WX_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], wxUSE_GTK2)
+AC_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])
WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE)
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
WX_ARG_WITH(sdl, [ --with-sdl use SDL for audio on Unix], wxUSE_LIBSDL)
WX_ARG_WITH(gnomeprint, [ --with-gnomeprint use GNOME print for printing under Unix], wxUSE_LIBGNOMEPRINT)
+WX_ARG_WITH(hildon, [ --with-hildon use Hildon framework for Nokia 770], wxUSE_LIBHILDON)
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
fi
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
if test "$USE_OS2" = "1"; then
+ DEFAULT_wxUSE_OMF=no
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
fi
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
+WX_ARG_ENABLE(universal_binary, [ --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working)], wxUSE_UNIVERSAL_BINARY)
-WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
-WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
+WX_ARG_ENABLE(compat24, [ --enable-compat24 enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
+WX_ARG_ENABLE(compat26, [ --disable-compat26 disable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, disable)
WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
dnl please keep the settings below in alphabetical order
WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE)
+WX_ARG_ENABLE(arcstream, [ --enable-arcstream use wxArchive streams], wxUSE_ARCHIVE_STREAMS)
+WX_ARG_ENABLE(backtrace, [ --enable-backtrace use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
WX_ARG_ENABLE(cmdline, [ --enable-cmdline use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
WX_ARG_ENABLE(datetime, [ --enable-datetime use wxDateTime class], wxUSE_DATETIME)
+WX_ARG_ENABLE(debugreport, [ --enable-debugreport use wxDebugReport class], wxUSE_DEBUGREPORT)
WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER)
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(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE)
WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
-WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS)
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING)
+WX_ARG_ENABLE(stdpaths, [ --enable-stdpaths use wxStandardPaths class], wxUSE_STDPATHS)
WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH)
+WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS)
WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
WX_ARG_ENABLE(textbuf, [ --enable-textbuf use wxTextBuffer class], wxUSE_TEXTBUFFER)
WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE)
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
WX_ARG_ENABLE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL)
+WX_ARG_ENABLE(gstreamer8, [ --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
-WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM)
+WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZip streams], wxUSE_ZIPSTREAM)
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(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW)
WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG)
WX_ARG_ENABLE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
+WX_ARG_ENABLE(html, [ --enable-richtext use wxRichTextCtrl], wxUSE_RICHTEXT)
dnl ---------------------------------------------------------------------------
dnl PostScript options
DEFAULT_wxUSE_ACCEL=yes
DEFAULT_wxUSE_BMPBUTTON=yes
DEFAULT_wxUSE_BUTTON=yes
- DEFAULT_wxUSE_CALCTRL=no
+ DEFAULT_wxUSE_CALCTRL=yes
DEFAULT_wxUSE_CARET=yes
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLISTBOX=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_CHOICEBOOK=yes
+ DEFAULT_wxUSE_DATEPICKCTRL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TOOLTIPS=yes
+ DEFAULT_wxUSE_TREEBOOK=yes
+ DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
DEFAULT_wxUSE_TIPWINDOW=yes
DEFAULT_wxUSE_CHECKLISTBOX=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_CHOICEBOOK=no
+ DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
+ DEFAULT_wxUSE_TREEBOOK=no
+ DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
DEFAULT_wxUSE_TIPWINDOW=no
WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE)
WX_ARG_ENABLE(choicebook, [ --enable-choicebook use wxChoicebook class], wxUSE_CHOICEBOOK)
WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
+WX_ARG_ENABLE(dataviewctrl,[ --enable-dataviewctrl, use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK)
WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
WX_ARG_ENABLE(statline, [ --enable-statline use wxStaticLine class], wxUSE_STATLINE)
WX_ARG_ENABLE(stattext, [ --enable-stattext use wxStaticText class], wxUSE_STATTEXT)
WX_ARG_ENABLE(statusbar, [ --enable-statusbar use wxStatusBar class], wxUSE_STATUSBAR)
-WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TABDIALOG)
+WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TAB_DIALOG)
WX_ARG_ENABLE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxUSE_TEXTCTRL)
WX_ARG_ENABLE(togglebtn, [ --enable-togglebtn use wxToggleButton class], wxUSE_TOGGLEBTN)
WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
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(treebook, [ --enable-treebook use wxTreebook class], wxUSE_TREEBOOK)
+WX_ARG_ENABLE(toolbook, [ --enable-toolbook use wxToolbook class], wxUSE_TOOLBOOK)
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)
WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME)
WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS)
WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES)
+WX_ARG_ENABLE(mousewheel, [ --enable-mousewheel use mousewheel], wxUSE_MOUSEWHEEL)
WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
-WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick (Linux only)], wxUSE_JOYSTICK)
-WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Windows only)], wxUSE_METAFILE)
+WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick], wxUSE_JOYSTICK)
+WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Win32 only)], wxUSE_METAFILE)
WX_ARG_ENABLE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
+if test "$wxUSE_MSW" = "1"; then
+ WX_ARG_ENABLE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
+fi
+
dnl ---------------------------------------------------------------------------
dnl support for image formats that do not rely on external library
dnl ---------------------------------------------------------------------------
wxUSE_SHARED=no
fi
+
if test "$wxUSE_GUI" = "yes"; then
if test "$USE_BEOS" = 1; then
fi
if test "$TOOLKIT_GIVEN" = 1; then
- dnl convert "yes" to 1 and "no" to 0
+ dnl convert "yes", "any" or a number to 1 and "no" to 0
for toolkit in `echo $ALL_TOOLKITS`; do
var=wxUSE_$toolkit
eval "value=\$${var}"
- eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+ if test "x$value" = "xno"; then
+ eval "$var=0"
+ elif test "x$value" != "x"; then
+ eval "$var=1"
+ fi
+
+ if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+ eval "wx${toolkit}_VERSION=$value"
+ fi
done
else
dnl try to guess the most apropriate toolkit for this platform
var=DEFAULT_DEFAULT_wxUSE_$toolkit
else
var=DEFAULT_wxUSE_$toolkit
+
+ eval "version=\$DEFAULT_wx${toolkit}_VERSION"
+ if test "x$version" != "x"; then
+ eval "wx${toolkit}_VERSION=$version"
+ fi
fi
eval "wxUSE_$toolkit=\$${var}"
done
AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
esac
+ # to be removed when --disable-gtk2 isn't needed
+ if test "x$wxUSE_GTK2" = "xyes"; then
+ wxGTK_VERSION=2
+ elif test "x$wxUSE_GTK2" = "xno"; then
+ wxGTK_VERSION=1
+ fi
+
dnl cache the wxUSE_<TOOLKIT> values too
for toolkit in `echo $ALL_TOOLKITS`; do
var=wxUSE_$toolkit
eval "cache=\$${cache_var}"
if test "$cache" = 1; then
echo "$var=$value" >> ${wx_arg_cache_file}
+ eval "version=\$wx${toolkit}_VERSION"
+ if test "x$version" != "x"; then
+ echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+ fi
fi
if test "$value" = 1; then
toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
*-*-cygwin*)
if test "$wxUSE_MSW" = 1 ; then
wants_win32=1
+ BAKEFILE_FORCE_PLATFORM=win32
else
doesnt_want_win32=1
fi
dnl FIXME: we should do a better job of testing for these
CC=winegcc
CXX=wineg++
- RESCOMP=wrc
LDFLAGS_GUI="-mwindows"
fi
dnl flush the cache because checking for programs might abort
AC_CACHE_SAVE
-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 -o "$USE_DOS" = 1 -o "$USE_UNIX" = 1; then
- CC=$host_alias-gcc
- CXX=$host_alias-c++
- AR=$host_alias-ar
- RANLIB=$host_alias-ranlib
- DLLTOOL=$host_alias-dlltool
- RESCOMP=$host_alias-windres
- STRIP=$host_alias-strip
- elif test "x$CC" '!=' "x"; then
- echo "You set CC, I assume you know what you are doing."
- else
- AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
- fi
-fi
-
dnl C-compiler checks
dnl defines CC with the compiler to use
dnl defines GCC with yes if using gcc
dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
dnl -g and -O flags ourselves below
CFLAGS=${CFLAGS:=}
-AC_PROG_CC
+AC_BAKEFILE_PROG_CC
dnl is -traditional needed for correct compilations
dnl adds -traditional for gcc if needed
AC_PROG_GCC_TRADITIONAL
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
dnl C++-compiler checks
dnl defines CXX with the compiler to use
dnl
dnl see CFLAGS line above
CXXFLAGS=${CXXFLAGS:=}
-AC_PROG_CXX
+AC_BAKEFILE_PROG_CXX
-AC_LANG_RESTORE
+AC_LANG_POP
dnl ranlib command
dnl defines RANLIB with the appropriate command
dnl ar command
dnl defines AR with the appropriate command
-AC_CHECK_PROG(AR, ar, ar)
+AC_CHECK_TOOL(AR, ar)
if test "x$AR" = "x" ; then
AC_MSG_ERROR([ar is needed to build wxWidgets])
fi
dnl The other BSD's should probably go in here too, since this is
dnl to workaround a strange static lib BSDism.
dnl Mac OS X install seems to ignore -p option...
- powerpc-*-darwin* )
+ *-*-darwin* )
INSTALL_PROGRAM="cp -fp"
INSTALL_DATA="cp -fp"
;;
esac
dnl strip command
-dnl defines STRIP as strip or nothing if not found
-AC_CHECK_PROG(STRIP, strip, strip, true)
+dnl defines STRIP as strip or nothing (true) if not found
+AC_CHECK_TOOL(STRIP, strip, true)
+
+dnl Win32 tools
+if test "$wxUSE_WINE" = "yes"; then
+ AC_CHECK_TOOL(WINDRES, wrc)
+ RESCOMP="$WINDRES"
+else
+ case "${host}" in
+ *-*-cygwin* | *-*-mingw32* )
+ dnl Bakefile CVS (as of 2005-11-24) now detects windres properly
+ dnl ... maybe it does, but it does not make it available here
+ dnl anymore, so do it ourselves still.
+ AC_CHECK_TOOL(WINDRES, windres)
+ RESCOMP="$WINDRES"
+ AC_CHECK_TOOL(DLLTOOL, dlltool)
+ ;;
+ esac
+fi
dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
dnl needed for making link to setup.h
AC_PROG_LN_S
+
dnl ------------------------------------------------------------------------
dnl Platform specific tests
dnl ------------------------------------------------------------------------
+dnl xlC needs -qunique under AIX so that one source file can be
+dnl compiled to multiple object files and safely linked together.
+if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
+ CXXFLAGS="-qunique $CXXFLAGS"
+fi
+
+dnl This case is for PowerPC OS X vs. everything else
+case "${host}" in
+ powerpc-*-darwin* )
+ AC_MSG_CHECKING([if __POWERPC__ is already defined])
+ AC_TRY_COMPILE([],[#ifndef __POWERPC__
+ choke me for lack of PowerPC
+#endif
+],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ AC_DEFINE(__POWERPC__)
+ ])
+ ;;
+esac
+
+dnl This case is for OS X vs. everything else
+case "${host}" in
+ *-*-darwin* )
+ AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
+ AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
+],[],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ AC_MSG_CHECKING([if __CF_USE_FRAMEWORK_INCLUDES__ is required])
+ AC_TRY_COMPILE([#define __CF_USE_FRAMEWORK_INCLUDES__
+#include <CoreFoundation/CFBase.h>
+ ],[],
+ [AC_MSG_RESULT([yes])
+ dnl We must use -D so source files that don't include wx/setup.h
+ dnl but do include CFBase will work.
+ CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS"],
+ [AC_MSG_FAILURE([no. CoreFoundation not available.])]
+ )
+ ]
+ )
+ ;;
+esac
+
+dnl This case is for OS/2 vs. everything else
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
dnl ---------------------------------------------------------------------
dnl Include resources for the "native" port (wxPM).
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
- AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[
- AC_TRY_COMPILE([],
+ dnl Check for the gcc version (and thereby for the C runtime library).
+ dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
+ dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1
+ dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5
+ dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6.
+ AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[
+ AC_TRY_RUN(
+ dnl Check the gcc version macro.
[
+ #include <stdio.h>
+
+ int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f,
#if (__GNUC__ < 3)
- #error old gcc
+ "EMX2"
+ #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
+ "EMX3"
+ #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2)
+ "Innotek5"
+ #else
+ "Innotek6"
#endif
+ );
+ exit(0);
+ }
],
- [
- AC_TRY_COMPILE([],
- [
- #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
- #error intermediate gcc
- #endif
- ],
- [
- wx_cv_gccversion=Innotek
- ],
- [
- wx_cv_gccversion=3
- ]
- )
- ],
- [
- wx_cv_gccversion=2
- ]
+ wx_cv_gccversion=`cat conftestval`,
+ wx_cv_gccversion="EMX2",
+ dnl Compilation error: Assuming standard EMX environment
+ wx_cv_gccversion="EMX2"
)
])
- if test "$wx_cv_gccversion" = "2"; then
+ if test "$wx_cv_gccversion" = "EMX2"; then
LIBS="$LIBS -lstdcpp"
LDFLAGS="$LDFLAGS -Zsysv-signals"
else
- if test "$wx_cv_gccversion" = "3"; then
- LIBS="$LIBS -lstdcxx"
+ if test "$wx_cv_gccversion" = "EMX3"; then
+ LIBS="$LIBS -lstdcxx -lgcc"
LDFLAGS="$LDFLAGS -Zsysv-signals"
else
LIBS="$LIBS -lstdc++"
fi
fi
- if test "$wxUSE_OMF" = "yes"; then
- LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+ if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
+ AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
+ wxUSE_OMF=yes
+ enable_omf=yes
fi
dnl (end of OS/2-only piece)
;;
dnl ---------------------------------------------------------------------
dnl (non-OS/2-only piece)
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [
AC_TRY_LINK([
fi
fi
- AC_LANG_RESTORE
+ AC_LANG_POP
dnl (end of non-OS/2-only piece)
;;
esac
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
- AC_CHECK_FUNCS(fnmatch)
-fi
-
dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
AC_CHECK_HEADERS(langinfo.h)
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
- dnl Explicitly link -lintl if langinfo.h is available.
- if test $ac_cv_header_langinfo_h = "yes"; then
+ dnl Explicitly link -lintl if langinfo.h is available
+ dnl and intl not yet included in libc
+ if test $ac_cv_header_langinfo_h = "yes" \
+ -a \( "$wx_cv_gccversion" = "EMX2" \
+ -o "$wx_cv_gccversion" = "EMX3" \
+ -o "$wx_cv_gccversion" = "Innotek5" \); then
LIBS="$LIBS -lintl"
fi
;;
esac
-if test "$wxUSE_GUI" = "yes"; then
- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
- dnl defines HAVE_X11_XKBLIB_H
- AC_CHECK_HEADERS(X11/Xlib.h)
- AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
- [
- #if HAVE_X11_XLIB_H
- #include <X11/Xlib.h>
- #endif
- ])
- fi
-fi
-
dnl ---------------------------------------------------------------------------
dnl Checks for compiler characteristics
dnl ---------------------------------------------------------------------------
AC_CHECK_SIZEOF(long long, 0)
if test "$ac_cv_sizeof_long_long" != "0"; then
dnl HPUX 10.20 headers need this define in order to use long long definitions
- CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
+ CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
fi
;;
* )
AC_CHECK_SIZEOF(long long, 0)
esac
-dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
-dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
-dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
-AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
-[
- AC_TRY_RUN(
- [
- /* DJGPP only has fake wchar_t: */
- #ifdef __DJGPP__
- # error "fake wchar_t"
- #endif
- #ifdef HAVE_WCHAR_H
- # ifdef __CYGWIN__
- # include <stddef.h>
- # endif
- # include <wchar.h>
- #endif
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
- #include <stdio.h>
- int main()
- {
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%i", sizeof(wchar_t));
- exit(0);
- }
- ],
- wx_cv_sizeof_wchar_t=`cat conftestval`,
- wx_cv_sizeof_wchar_t=0,
- [
- case "${host}" in
- *-pc-msdosdjgpp )
- wx_cv_sizeof_wchar_t=0
- ;;
- * )
- wx_cv_sizeof_wchar_t=4
- ;;
- esac
- ]
- )
-])
-
-AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
+dnl SGI/Irix's stdio.h does not include wchar_t. Mac OS X does not provide
+dnl wchar.h and wchar_t is defined by stdlib.h (GD)
+AC_CHECK_SIZEOF(wchar_t, 0,
+ [
+ /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
+ #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
+ # error "fake wchar_t"
+ #endif
+ #ifdef HAVE_WCHAR_H
+ # ifdef __CYGWIN__
+ # include <stddef.h>
+ # endif
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #include <stdio.h>
+ ]
+)
+if test "$ac_cv_sizeof_wchar_t" != "0"; then
+ wxUSE_WCHAR_T=yes
+else
+ wxUSE_WCHAR_T=no
+fi
dnl checks needed to define wxVaCopy
AC_CACHE_CHECK([for va_copy],
dnl problems
if test "x$wx_largefile" = "xyes"; then
if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
- WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+
+ dnl We get "Large Files (ILP32) not supported in strict ANSI mode."
+ dnl #error from HP standard headers unless __STDC_EXT__ is defined.
+ dnl The compiler should define it automatically, but some old g++
+ dnl versions don't define it, so test and add it if necessary. AFAIK
+ dnl the problem only affects the C++ compiler so it is added to
+ dnl CXXFLAGS only.
+ if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+ AC_CACHE_CHECK(
+ [if -D__STDC_EXT__ is required],
+ wx_cv_STDC_EXT_required,
+ [
+ AC_LANG_PUSH(C++)
+ AC_TRY_COMPILE(
+ [],
+ [
+ #ifndef __STDC_EXT__
+ choke me
+ #endif
+ ],
+ wx_cv_STDC_EXT_required=no,
+ wx_cv_STDC_EXT_required=yes
+ )
+ AC_LANG_POP
+ ]
+ )
+ if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
+ fi
+ fi
else
- WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
fi
dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
AC_FUNC_FSEEKO
if test "$ac_cv_sys_largefile_source" != no; then
- WX_LARGEFILE_FLAGS="$WX_LARGEFILE_FLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
fi
- CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
fi
dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
AC_CXX_CONST_CAST
AC_CXX_REINTERPRET_CAST
AC_CXX_STATIC_CAST
+dnl we don't use HAVE_DYNAMIC_CAST anywhere right now...
+dnl AC_CXX_DYNAMIC_CAST
+
+dnl With Sun CC, temporaries have block scope by default. This flag is needed
+dnl to get the expression scope behaviour that conforms to the standard.
+if test "x$SUNCXX" = xyes; then
+ CXXFLAGS="-features=tmplife $CXXFLAGS"
+fi
+
+dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
+dnl was to hack their C++ compiler to accept them silently -- but C compiler
+dnl still spits out dozens of warnings for each X include file, so suppress
+dnl them
+if test "x$SUNCC" = xyes; then
+ CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
+fi
+
+dnl SGI mipsPro compiler gives this warning for "conversion from pointer to
+dnl same-sized integral type" even when there is an explicit cast and as there
+dnl is no way to turn it off and there are hundreds of these warnings in wx
+dnl sources, just turn it off for now
+dnl
+dnl a better long term solution would be to use #pragma set/reset woff in
+dnl wxPtrToUInt() and use it instead of casts elsewhere
+if test "x$SGICC" = "xyes"; then
+ CFLAGS="-woff 3970 $CFLAGS"
+fi
+if test "x$SGICXX" = "xyes"; then
+ CXXFLAGS="-woff 3970 $CXXFLAGS"
+fi
+
+dnl HP-UX c89/aCC compiler warnings
+if test "x$HPCC" = "xyes"; then
+ dnl 2011: "unrecognized preprocessor directive": nice warning but it's given
+ dnl even for directives inside #if which is not true (i.e. which are
+ dnl used for other compilers/OS) and so we have no way to get rid of it
+ dnl 2450: "long long is non standard" -- yes, we know
+ CFLAGS="+W 2011,2450 $CFLAGS"
+fi
+if test "x$HPCXX" = "xyes"; then
+ dnl 2340: "value copied to temporary, reference to temporary used": very
+ dnl painful as triggered by any occurrence of user-defined conversion
+ CXXFLAGS="+W 2340 $CXXFLAGS"
+fi
+
+dnl DEC/Compaq/HP cxx warnings
+if test "x$COMPAQCXX" = "xyes"; then
+ dnl -w0 enables all warnings, then we disable some of them:
+ dnl basclsnondto: base class dtor non virtual (sometimes we do want this)
+ dnl unrimpret: "end of routine block may be unreachable" is given for
+ dnl every "if ( ) return ...; else return ...;"
+ dnl intconlosbit: "conversion to integral type of smaller size could lose
+ dnl data" this is a useful warning but there are too many of
+ dnl them for now
+ CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
+fi
+
+dnl check for std::string or std::wstring
+if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
+ AC_LANG_PUSH(C++)
+
+ if test "$wxUSE_UNICODE" = "yes"; then
+ std_string="std::wstring"
+ char_type="wchar_t"
+ else
+ std_string="std::string"
+ char_type="char"
+ fi
+
+ dnl check if <string> declares std::wstring
+ AC_MSG_CHECKING([for $std_string in <string>])
+ AC_TRY_COMPILE([#include <string>],
+ [$std_string foo;],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STD_WSTRING)],
+ [AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([if std::basic_string<$char_type> works])
+ AC_TRY_COMPILE([
+ #ifdef HAVE_WCHAR_H
+ # ifdef __CYGWIN__
+ # include <stddef.h>
+ # endif
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #include <stdio.h>
+ #include <string>
+ ],
+ [std::basic_string<$char_type> foo;
+ const $char_type* dummy = foo.c_str();],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT([no])
+ if test "$wxUSE_STL" = "yes"; then
+ AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
+ elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+ AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
+ else
+ AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
+ wxUSE_STD_STRING=no
+ fi
+ ]
+ )
+ ])
+
+ AC_LANG_POP
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+ AC_LANG_PUSH(C++)
+
+ AC_CHECK_TYPES([std::istream, std::ostream],,
+ [wxUSE_STD_IOSTREAM=no],
+ [#include <iostream>])
+
+ if test "$wxUSE_STD_IOSTREAM" != "yes"; then
+ if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+ AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
+ else
+ AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
+ fi
+ fi
+
+ AC_LANG_POP
+fi
-dnl check various STL features
if test "$wxUSE_STL" = "yes"; then
AC_LANG_PUSH(C++)
#include <list>],
[std::vector<int> moo;
std::list<int> foo;
- std::vector<int>::iterator it =
+ std::vector<int>::iterator it =
std::find_if(moo.begin(), moo.end(),
std::bind2nd(std::less<int>(), 3));],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Basic STL functionality missing])])
- dnl check if <string> declares std::wstring
- AC_MSG_CHECKING([for std::wstring in <string>])
- AC_TRY_COMPILE([#include <string>],
- [std::wstring foo;],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STD_WSTRING)],
- [AC_MSG_RESULT(no)])
-
dnl check for compliant std::string::compare
AC_MSG_CHECKING([for compliant std::string::compare])
AC_TRY_COMPILE([#include <string>],
/usr/Motif-2.1/include \
/usr/Motif-1.2/include \
/usr/include/Motif1.2 \
- /opt/xpm/include/X11 \
- /opt/GBxpm/include/ \
- /opt/GBxpm/X11/include/ \
\
/usr/dt/include \
/usr/openwin/include \
/usr/local/X11/include \
/usr/local/include/X11 \
\
- /usr/X386/include \
- /usr/x386/include \
/usr/XFree86/include/X11 \
- \
- X:/XFree86/include \
- X:/XFree86/include/X11 \
- \
- /usr/include/gtk \
- /usr/local/include/gtk \
- /usr/include/glib \
- /usr/local/include/glib \
- \
- /usr/include/qt \
- /usr/local/include/qt \
- \
- /usr/local/arm/3.3.2/include \
- \
- /usr/include/windows \
- /usr/include/wine \
- /usr/local/include/wine \
- \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
+ /usr/pkg/include \
\
/usr/openwin/share/include"
-dnl prepend lib and lib32 for IRIX where the files in these directories should
-dnl be found before the ones in lib64 for 32bit compilation -- of course, this
-dnl probably/surely breaks 64bit compilation... IMO the only real solution is to
-dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead
-dnl
-dnl add 64 bit versions for Linux on AMD (this is not perfect but well...)
-SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64"
+dnl try to find out the standard lib locations for the systems with multiple
+dnl ABIs
+AC_MSG_CHECKING([for libraries directory])
+
+case "${host}" in
+ *-*-irix6* )
+ AC_CACHE_VAL(
+ wx_cv_std_libpath,
+ [
+ for d in WX_STD_LIBPATH(); do
+ for e in a so sl dylib dll.a; do
+ libc="$d/libc.$e"
+ if test -f $libc; then
+ save_LIBS="$LIBS"
+ LIBS="$libc"
+ AC_LINK_IFELSE([int main() { return 0; }],
+ wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
+ LIBS="$save_LIBS"
+ if test "x$wx_cv_std_libpath" != "x"; then
+ break 2
+ fi
+ fi
+ done
+ done
+ if test "x$wx_cv_std_libpath" = "x"; then
+ wx_cv_std_libpath="lib"
+ fi
+ ]
+ )
+ ;;
+
+ *-*-solaris2* )
+ dnl use ../lib or ../lib/64 depending on the size of void*
+ if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
+ wx_cv_std_libpath="lib/64"
+ else
+ wx_cv_std_libpath="lib"
+ fi
+ ;;
+
+ *-*-linux* )
+ dnl use ../lib or ../lib64 depending on the size of void*
+ if test "$ac_cv_sizeof_void_p" = 8 -a \
+ -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+ wx_cv_std_libpath="lib64"
+ else
+ wx_cv_std_libpath="lib"
+ fi
+ ;;
+
+ *)
+ wx_cv_std_libpath="lib";
+ ;;
+esac
+
+AC_MSG_RESULT($wx_cv_std_libpath)
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+
+dnl Cross compiling with gcc?
+if test "$build" != "$host" -a "$GCC" = yes; then
+ dnl for gcc cross-compilers "$CC -print-prog-name=ld" prints the path to
+ dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+ dnl for a 'root' below which libraries and headers for the target system
+ dnl might be installed.
+ if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+ cross_root=`dirname $cross_root`
+ cross_root=`dirname $cross_root`
+
+ dnl substitute this candiate root for '^/usr' in the search lists,
+ dnl strip out any that don't start '^/usr'.
+ SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+ SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+ SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
+
+ dnl also have pkg-config search for *.pc files under this 'root'
+ if test -z "$PKG_CONFIG_PATH"; then
+ PKG_CONFIG_PATH="$cross_root/local/lib/pkgconfig:$cross_root/lib/pkgconfig"
+ export PKG_CONFIG_PATH
+ fi
+
+ dnl AC_PATH_XTRA doesn't work currently unless -x-includes and
+ dnl -x-libraries are given on the command line. So if they are not
+ dnl set then set them here to plausible defaults.
+ if test -z "$x_includes" -o "$x_includes" = NONE; then
+ WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h)
+ x_includes=$ac_find_includes
+ fi
+ if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+ WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
+ x_libraries=$ac_find_libraries
+ fi
+ fi
+fi
dnl ------------------------------------------------------------------------
dnl Check for libraries
AC_TRY_COMPILE([#include <features.h>],
[
#if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
- #error not glibc2.1
+ not glibc 2.1
#endif
],
[
if test "$wxUSE_REGEX" != "no"; then
AC_DEFINE(wxUSE_REGEX)
-
+
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
AC_MSG_WARN([Defaulting to the the builtin regex library for Unicode build.])
wxUSE_REGEX=builtin
if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
dnl according to Unix 98 specs, regcomp() is in libc but I believe that
dnl on some old systems it may be in libregex - check for it too?
- AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
+ AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)])
if test "x$ac_cv_func_regcomp" != "xyes"; then
if test "$wxUSE_REGEX" = "sys" ; then
dnl Check for expat libraries
dnl ------------------------------------------------------------------------
+if test "$wxUSE_WCHAR_T" != "yes"; then
+ if test "$wxUSE_EXPAT" != "no"; then
+ AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling])
+ wxUSE_EXPAT=no
+ fi
+ if test "$wxUSE_XML" != "no"; then
+ AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling])
+ wxUSE_XML=no
+ fi
+fi
+
if test "$wxUSE_EXPAT" != "no"; then
wxUSE_XML=yes
AC_DEFINE(wxUSE_EXPAT)
AC_DEFINE(wxUSE_XML)
-
- if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
+
+ if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
AC_CHECK_HEADER([expat.h], [found_expat_h=1])
if test "x$found_expat_h" = "x1"; then
dnl Expat 1.95.6 comes with broken expat.h:
AC_CACHE_CHECK([if expat.h is valid C++ header],
wx_cv_expat_is_not_broken,
[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <expat.h>],[],
wx_cv_expat_is_not_broken=yes,
wx_cv_expat_is_not_broken=no
)
- AC_LANG_RESTORE
+ AC_LANG_POP
]
)
if test "$wx_cv_expat_is_not_broken" = "yes" ; then
*-*-cygwin* )
dnl Cygwin doesn't include these by default
LIBS="$LIBS -lkernel32 -luser32"
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
esac
dnl add extra odbc libs if we have compiled in odbc
fi
dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
+ dnl This one is still used by some sample makefiles.
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+ dnl This lot we export to wx-config. It must add the relevant
+ dnl include directories at the point when they can be known.
+ dnl (but are these (still) required anyway?)
+ WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
fi
GTK_MODULES=gthread
fi
- dnl note that if we fail to find GTK2 we abort and don't fall
- dnl back to GTK1.x
+ dnl detect GTK2
wx_cv_lib_gtk=
- if test "x$wxUSE_GTK2" = "xyes"; then
+ if test "x$wxGTK_VERSION" != "x1"
+ then
+ dnl The gthread.pc that ships with solaris returns '-mt',
+ dnl it's correct for Sun CC, but gcc requires '-pthreads'.
+ dnl So disable the compile check and remove the -mt below.
+ case "${host}" in
+ *-*-solaris2* )
+ if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
+ enable_gtktest=no
+ fi
+ esac
+
AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
- else
- AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
- if test -z "$wx_cv_lib_gtk"; then
- AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+ dnl Remove the '-mt' for gcc on solaris
+ case "${host}" in
+ *-*-solaris2* )
+ if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
+ GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
+ GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
+ fi
+ dnl solaris also requires -lX11 for static lib
+ if test "$wxUSE_SHARED" != "yes"; then
+ GTK_LIBS="$GTK_LIBS -lX11"
+ fi
+ esac
+ fi
+
+ dnl detect GTK1.x
+ if test -z "$wx_cv_lib_gtk"; then
+ if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
+ AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
+
+ if test -z "$wx_cv_lib_gtk"; then
+ AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+ fi
fi
fi
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
dnl subsequent runs
wx_cv_cflags_gtk=$GTK_CFLAGS
- wx_cv_libs_gtk=$GTK_LIBS
+ wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[[^ ]]*cairo[[^ ]]*//g'`
fi
]
)
1.2.3) WXGTK12=1
;;
*) AC_MSG_ERROR([
-Please check that gtk-config is in path, the directory
-where GTK+ libraries are installed (returned by
-'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-equivalent variable and GTK+ is version 1.2.3 or above.
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
])
;;
esac
if test "$WXGTK20" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
-
- AC_CHECK_FUNCS([pango_font_family_is_monospace])
-
+ CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
+ LIBS="$LIBS $wx_cv_libs_gtk"
+
+ dnl gtk_icon_size_lookup is not available in the GTK+ headers
+ dnl that have shipped with some versions of Sun's JDS. Not using
+ dnl AC_CHECK_FUNCS here since it only checks the function exists
+ dnl in the lib (not the header).
+ AC_MSG_CHECKING([if gtk_icon_size_lookup is missing])
+ AC_TRY_COMPILE([
+ #include <gtk/gtk.h>
+ ],
+ [
+ void *f = gtk_icon_size_lookup;
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ],
+ [
+ AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)
+ AC_MSG_RESULT([yes])
+ ])
+
dnl test if we have at least GTK+ 2.4:
AC_MSG_CHECKING([if GTK+ is version >= 2.4])
AC_TRY_COMPILE([
],
[
#if !GTK_CHECK_VERSION(2,4,0)
- #error "Not GTK+ 2.4"
+ Not GTK+ 2.4
#endif
],
[
[
AC_MSG_RESULT([no])
])
-
+
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else
dnl test for XIM support in libgdk
AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
-
-
+
+
dnl test for external libxpm if we're configured to use it
if test "$wxUSE_GPE" = "yes"; then
AC_MSG_CHECKING(for gpewidget library)
dnl we guess its path from the prefix
GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
WXGPE=1
- AC_MSG_RESULT(found at $ac_find_libraries)
+ AC_MSG_RESULT([found in $ac_find_libraries])
else
AC_MSG_RESULT(not found)
fi
dnl if test "$ac_find_libraries" != "" ; then
dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
- dnl AC_MSG_RESULT(found at $ac_find_libraries)
+ dnl AC_MSG_RESULT(found in $ac_find_libraries)
dnl else
dnl AC_MSG_RESULT(not found)
dnl fi
AC_PATH_XTRA
if test "$no_x" = "yes"; then
- AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
+ AC_MSG_ERROR([X11 not found, please use --x-includes and/or --x-libraries options (see config.log for details)])
fi
dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE (and
if test "$wxUSE_UNICODE" = "yes"; then
PKG_CHECK_MODULES(PANGOX, pangox,
[
- CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
+ CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
],
[
)
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[
- CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
+ CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
],
[
PKG_CHECK_MODULES(PANGOXFT, pangoxft,
[
AC_DEFINE(HAVE_PANGO_XFT)
- CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
+ CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
],
[
)
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $PANGOX_CFLAGS"
+ CFLAGS="$PANGOX_CFLAGS $CFLAGS"
LIBS="$LIBS $PANGOX_LIBS"
AC_CHECK_FUNCS([pango_font_family_is_monospace])
CFLAGS="$save_CFLAGS"
fi
if test "$wxUSE_MOTIF" = 1; then
+ if test "$wxUSE_UNICODE" = "yes"; then
+ AC_MSG_ERROR([Unicode configuration not supported with Motif])
+ fi
+
AC_MSG_CHECKING(for Motif/Lesstif headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
if test "$ac_find_includes" != "" ; then
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
else
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+
AC_TRY_COMPILE(
[
#include <Xm/Xm.h>
],
[
AC_MSG_RESULT(no)
- AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h)
+ AC_MSG_ERROR(please set CPPFLAGS to contain the location of Xm/Xm.h)
]
)
+
+ CFLAGS=$save_CFLAGS
fi
- if test "$COMPILED_X_PROGRAM" = 0; then
- AC_MSG_CHECKING(for Motif/Lesstif library)
- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
- if test "$ac_find_libraries" != "" ; then
- AC_MSG_RESULT(found at $ac_find_libraries)
- WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
- else
- dnl it might happen that we found headers in one of the
- dnl standard paths but the libs are elsewhere - we do need to
- dnl try to compile a sample program then here
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ AC_MSG_CHECKING(for Motif/Lesstif library)
+ WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
- AC_TRY_COMPILE(
- [
- #include <Xm/Xm.h>
- ],
- [
- int version;
- version = xmUseVersion;
- ],
- [
- AC_MSG_RESULT(found in default search path)
- COMPILED_X_PROGRAM=1
- ],
- [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm)
- ]
- )
+ if test "x$ac_find_libraries" != "x" ; then
+ AC_MSG_RESULT(found in $ac_find_libraries)
- CFLAGS=$save_CFLAGS
- fi
+ WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+ else
+ dnl it might happen that we found headers in one of the standard
+ dnl paths but the libs are elsewhere but still in default (linker)
+ dnl path -- try to compile a test program to check for this
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
+
+ AC_TRY_LINK(
+ [
+ #include <Xm/Xm.h>
+ ],
+ [
+ int version;
+ version = xmUseVersion;
+ ],
+ [
+ AC_MSG_RESULT(found in default search path)
+ COMPILED_X_PROGRAM=1
+ ],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm)
+ ]
+ )
+
+ CFLAGS=$save_CFLAGS
+ LIBS="$save_LIBS"
fi
AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE])
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_LINK(
[
AC_MSG_ERROR([can't link a simple motif program])
fi
+ dnl this seems to be needed under IRIX and shouldn't do any harm
+ dnl elsewhere
+ AC_CHECK_LIB(Sgm, [SgCreateList], [libsgm_link=" -lSgm"])
+
save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
- AC_MSG_CHECKING([for Motif 2])
- AC_TRY_COMPILE([
- #include <Xm/Xm.h>
- ],
- [
- #if XmVersion < 2000
- #error "Not Motif 2"
- #endif
- ],
- [
- AC_DEFINE(__WXMOTIF20__,1)
- AC_MSG_RESULT([found])
- ],
- [
- AC_DEFINE(__WXMOTIF20__,0)
- AC_MSG_RESULT([not found])
- ])
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+
+ AC_CACHE_CHECK([for Motif 2],
+ wx_cv_lib_motif2,
+ AC_TRY_COMPILE([
+ #include <Xm/Xm.h>
+ ],
+ [
+ #if XmVersion < 2000
+ Not Motif 2
+ #endif
+ ],
+ wx_cv_lib_motif2="yes",
+ wx_cv_lib_motif2="no"))
+ if test "$wx_cv_lib_motif2" = "yes"; then
+ AC_DEFINE(__WXMOTIF20__,1)
+ else
+ AC_DEFINE(__WXMOTIF20__,0)
+ fi
+
+ AC_CACHE_CHECK([whether Motif is Lesstif],
+ wx_cv_lib_lesstif,
+ AC_TRY_COMPILE([
+ #include <Xm/Xm.h>
+ ],
+ [
+ #if !defined(LesstifVersion) || LesstifVersion <= 0
+ Not Lesstif
+ #endif
+ ],
+ wx_cv_lib_lesstif="yes",
+ wx_cv_lib_lesstif="no")
+ )
+ if test "$wx_cv_lib_lesstif" = "yes"; then
+ AC_DEFINE(__WXLESSTIF__,1)
+ else
+ AC_DEFINE(__WXLESSTIF__,0)
+ fi
+
CFLAGS=$save_CFLAGS
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
fi
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
- AC_MSG_RESULT(found at $ac_find_libraries)
+ AC_MSG_RESULT(found in $ac_find_libraries)
AC_CACHE_CHECK([for X11/xpm.h],
wx_cv_x11_xpm_h,
[
save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_COMPILE(
[
if test "$wxHAVE_XEXT_LIB" = 1; then
save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_MSG_CHECKING([for X11/extensions/shape.h])
AC_TRY_COMPILE([
- #include <X11/Xlib.h>
+ #include <X11/Xlib.h>
#include <X11/extensions/shape.h>
],
[
fi
if test "x$wxUSE_UNIX" = "xyes"; then
- CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+ CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS"
else
dnl platform.h needs TARGET_CARBON before setup.h
- CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON"
+ CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
fi
TOOLKIT=MAC
dnl Optional libraries included when system library is not used
dnl ---------------------------------------------------------------------------
+dnl do this after test for X11 above so that we have a chance of finding Xlib.h
+if test "$wxUSE_GUI" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
+ dnl defines HAVE_X11_XKBLIB_H
+ AC_CHECK_HEADERS(X11/Xlib.h)
+ AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
+ [
+ #if HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+ ])
+ fi
+fi
+
dnl ----------------------------------------------------------------
dnl iODBC support
IODBC_C_SRC=""
-dnl ODBC is handled seperately for MSW
+dnl ODBC is handled separately for MSW
if test "$TOOLKIT" != "MSW" ; then
if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
])
])
- fi
+ fi
if test "x$ODBC_LINK" = "x" ; then
if test "$wxUSE_ODBC" = "sys" ; then
AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
wxUSE_ODBC=sys
fi
fi
- if test "$wxUSE_ODBC" != "no" ; then
- AC_DEFINE(wxUSE_ODBC)
- if test "$wxUSE_ODBC" = "builtin" ; then
- AC_DEFINE(wxUSE_BUILTIN_IODBC)
- fi
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
- dnl is this still necessary in 2.5?
- WXODBCFLAG="-D_IODBC_"
+
+ if test "$wxUSE_ODBC" = "builtin" ; then
+ AC_DEFINE(wxUSE_BUILTIN_IODBC)
fi
fi
+if test "$wxUSE_ODBC" != "no" ; then
+ AC_DEFINE(wxUSE_ODBC)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+
+ dnl is this still necessary?
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
+fi
dnl ---------------------------------------------------------------------------
dnl wxDisplay Sanity checks
[
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
],
- [],
+ [],
[
#if HAVE_X11_XLIB_H
#include <X11/Xlib.h>
else
AC_MSG_RESULT([no])
fi
-
+
else
AC_MSG_RESULT([no])
AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
fi
fi
-dnl ---------------------------------------------------------------------------
-dnl wxMediaCtrl
-dnl ---------------------------------------------------------------------------
-
-if test "$wxUSE_MEDIACTRL" = "yes"; then
- if test "$wxUSE_MSW" = 1; then
-dnl ---------------------------------------------------------------------------
-dnl DirectShow MSW
-dnl ---------------------------------------------------------------------------
- wxUSE_DIRECTSHOW="yes"
- AC_CHECK_HEADERS([dshow.h], [],
- [
- wxUSE_DIRECTSHOW="no"
- AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
- ],
- [#include <windows.h>])
-
- if test "$wxUSE_DIRECTSHOW" = "yes"; then
- AC_DEFINE(wxUSE_DIRECTSHOW)
- LIBS="$LIBS -lstrmiids"
- fi
- fi
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
- AC_DEFINE(wxUSE_MEDIACTRL)
-fi
-
dnl ---------------------------------------------------------------------------
dnl OpenGL libraries
dnl ---------------------------------------------------------------------------
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found in $ac_find_includes)
WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
- CPPFLAGS="$CPPFLAGS$ac_path_to_include"
+ CPPFLAGS="$ac_path_to_include $CPPFLAGS"
fi
AC_CHECK_HEADER(GL/gl.h,
AC_MSG_CHECKING([for -lGL])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
if test "$ac_find_libraries" != "" ; then
+ AC_MSG_RESULT([yes])
+
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
if test "$ac_path_to_link" != " -L/usr/lib" ; then
LDFLAGS_GL="$ac_path_to_link"
dnl don't suppose that libGL and libGLU are always in the
dnl same directory -- this is not true for some common
dnl distributions
+ AC_MSG_CHECKING([for -lGLU])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
found_gl=1
OPENGL_LIBS="-lGL -lGLU"
AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
fi
+ else
+ AC_MSG_RESULT([no])
fi
if test "$found_gl" != 1; then
- AC_MSG_RESULT([no])
AC_MSG_CHECKING([for -lMesaGL])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
if test "$ac_find_libraries" != "" ; then
if test "x$OPENGL_LIBS" = "x"; then
dnl it should be an error and not a warning because OpenGL is not on
- dnl by default and so if it had been explicitely requested, we
+ dnl by default and so if it had been explicitly requested, we
dnl shouldn't just fall back to compiling the library without it
AC_MSG_ERROR(OpenGL libraries not available)
fi
*-*-linux* | *-*-gnu* )
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
- ;;
+ ;;
*-*-solaris2* )
if test "$GCC" = yes ; then
dnl newer versions of gcc need -isystem to compile X headers on
dnl Solaris (which use old style C syntax)
- CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+ CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
dnl gcc may use Sun's ld, in which case -rpath gives a confusing
dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
WXCONFIG_RPATH="-Wl,-R,\$libdir"
],[
AC_MSG_RESULT([no])
- ])
+ ])
])
LDFLAGS="$saveLdflags"
else
WXCONFIG_RPATH="-R\$libdir"
fi
;;
-
- powerpc-*-darwin* )
- SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
- cat <<EOF >change-install-names
+
+ *-*-darwin* )
+ install_name_tool=`which install_name_tool`
+ if test "$install_name_tool" -a -x "$install_name_tool"; then
+ SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+ cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
inst_cmd="install_name_tool "
done
\${inst_cmd} \${3}
EOF
- chmod +x change-install-names
+ chmod +x change-install-names
+ fi
;;
-
+
*-*-cygwin* | *-*-mingw32* )
- TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
- ;;
-
+ dnl this one shouldn't be used for the library build so put it in a
+ dnl separate variable from WXCONFIG_CPPFLAGS
+ WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
+ ;;
+
+ *-*-hpux* )
+ SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib"
+ WXCONFIG_RPATH="-Wl,+b,\$libdir"
+ ;;
+
esac
if test $wxUSE_RPATH = "no"; then
dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
dnl If we ever need to do that, we won't need to keep these.
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
-WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
-
-
+if test "${TOOLKIT_DIR}" = "os2"; then
+ WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+else
+ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+fi
+
+
+
+if test "$wxUSE_COCOA" = 1; then
+ AC_LANG_SAVE
+ AC_WX_LANG_OBJECTIVEC
+dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
+dnl gets IOKit/graphics/IOGraphicsTypes.h included which typedefs
+dnl Point but only if MacTypes.h was not included first. Of course,
+dnl if MacTypes.h is included later then you're screwed when it
+dnl tries to typedef Point. Defining __Point__ will cause IOGraphicsTypes.h
+dnl to not typedef Point and thus fix the problem.
+ AC_MSG_CHECKING([if AppKit/NSEvent.h conflicts with CoreFoundation])
+ AC_TRY_COMPILE([#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+ ],[],
+ [AC_MSG_RESULT([no])],
+ [AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([if defining __Point__ will fix it])
+ AC_TRY_COMPILE([#define __Point__ 1
+#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+ ],[],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE(__Point__)
+ ],
+ [AC_MSG_FAILURE([no])]
+ )]
+ )
+ AC_LANG_RESTORE
+fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
dnl base name of the resource file for wxMac must be the same
dnl add the resources target for wxMac
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
- AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+ AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
dnl resources are bundled both with shared library and applications
dnl since the carb resource *must* be included in the application
if test "$wxUSE_MAC" = 1; then
- MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
-
- dnl this command is used to implement `wx-config --rezflags` and it is
- dnl eval'd there so escape any metacharacters inside
- MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
+ RESCOMP="$REZ"
+ WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
else
- MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
- MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+ RESCOMP="echo -n \| $REZ"
+ WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
fi
+
else
dnl default value is to (silently) do nothing in the makefile
MACSETFILE="@true"
- MACRESWXCONFIG="@true"
- dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step
if test "$wxUSE_PM" = 1; then
- MACRESCOMP="emxbind -ep"
+ RESCOMP="emxbind"
+ WXCONFIG_RESFLAGS="-ep"
+
+ dnl Is this one really used anywhere for pm?
+ POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
else
- MACRESCOMP="@true"
+ POSTLINK_COMMAND="@true"
fi
+
fi
dnl check what exactly size_t is on this machine - this is necessary to avoid
dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
AC_CACHE_CHECK([if size_t is unsigned int],
wx_cv_size_t_is_uint,
[
fi
fi
-AC_LANG_RESTORE
+AC_LANG_POP
dnl ---------------------------------------------------------------------------
dnl Checks for structures
dnl ---------------------------------------------------------------------------
dnl don't check for wchar_t functions if we haven't got wchar_t itself
-if test "$wx_cv_sizeof_wchar_t" != "0"; then
+if test "$wxUSE_WCHAR_T" = "yes"; then
AC_DEFINE(wxUSE_WCHAR_T)
dnl check for wcslen in all possible places
AC_DEFINE(HAVE_WCSLEN)
fi
- dnl HP-UX aCC needs this define to find mbstrtowcs() &c
- if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then
- CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
+ dnl On HP-UX aCC need this define to find mbstrtowcs() &c
+ dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
+ dnl with g++'s in <cwchar> (unless -D_INCLUDE__STDC_A1_SOURCE is in the
+ dnl flags when g++ is configured, it will declare it's own).
+ if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+ CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
fi
- dnl try to use wcsrtombs instead of wcstombs which is buggy in old GNU
- dnl libc versions if possible
- AC_CHECK_FUNCS(wcsrtombs)
+ dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
+ dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
+ dnl library, not the header, so do a header check for mbstate_t first.
+ AC_CHECK_TYPES([mbstate_t],
+ [AC_CHECK_FUNCS(wcsrtombs)],
+ [],
+ [#include <wchar.h>])
else
AC_MSG_WARN([Wide character support is unavailable])
fi
dnl *printf() functions sometimes are available in the library but not
dnl prototyped -- if this is the case, we can't use them from C++ code, but to
dnl detect this we have to use C++ compiler for testing
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
dnl check for vsnprintf() -- a safe version of vsprintf())
dnl
-dnl the trouble here is that on some systems (notable HP-UX) this function is
+dnl the trouble here is that on some systems (e.g HP-UX 10) this function is
dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
dnl stupidly, provides a dummy function declaration inside its extension)
dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
dnl
dnl so we first check if the function is in the library
-AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf)
if test "$ac_cv_func_vsnprintf" = "yes"; then
dnl yes it is -- now check if it is in the headers
AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
[
+ dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
+ dnl taking "char *" and not "const char *" while Metrowerks does
+ dnl provide a correct vsnprintf declaration but in C++ mode it's
+ dnl always in std namespace and so we have to bring it in scope
AC_TRY_COMPILE(
[
#include <stdio.h>
#include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
],
[
char *buf;
if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
AC_DEFINE(HAVE_VSNPRINTF_DECL)
+
+ dnl we know there is a vsnprintf declaration, but some old headers
+ dnl may have one taking a "char *" format instead of "const char *"
+ AC_CACHE_CHECK([if vsnprintf declaration is broken], wx_cv_func_broken_vsnprintf_decl,
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
+ ],
+ [
+ char *buf;
+ va_list ap;
+ const char *fmt = "%s";
+ vsnprintf(buf, 10u, fmt, ap);
+ ],
+ wx_cv_func_broken_vsnprintf_decl=no,
+ wx_cv_func_broken_vsnprintf_decl=yes
+ )
+ ]
+ )
+
+ if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
+ AC_DEFINE(HAVE_BROKEN_VSNPRINTF_DECL)
+ fi
+ fi
+fi
+
+dnl the same as above but for snprintf() now: it's not present in at least AIX
+dnl 4.2 headers
+if test "$ac_cv_func_snprintf" = "yes"; then
+ AC_CACHE_CHECK([for snprintf declaration], wx_cv_func_snprintf_decl,
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
+ ],
+ [
+ char *buf;
+ snprintf(buf, 10u, "%s", "wx");
+ ],
+ wx_cv_func_snprintf_decl=yes,
+ wx_cv_func_snprintf_decl=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_func_snprintf_decl" = "yes"; then
+ AC_DEFINE(HAVE_SNPRINTF_DECL)
+
+ dnl we know there is an snprintf declaration, but some old headers
+ dnl may have one taking a "char *" format instead of "const char *"
+ AC_CACHE_CHECK([if snprintf declaration is broken], wx_cv_func_broken_snprintf_decl,
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
+ ],
+ [
+ char *buf;
+ const char *fmt = "%s";
+ snprintf(buf, 10u, fmt, "wx");
+ ],
+ wx_cv_func_broken_snprintf_decl=no,
+ wx_cv_func_broken_snprintf_decl=yes
+ )
+ ]
+ )
+
+ if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
+ AC_DEFINE(HAVE_BROKEN_SNPRINTF_DECL)
+ fi
fi
fi
[AC_MSG_RESULT([no])]);
fi
-AC_LANG_RESTORE
+AC_LANG_POP
+
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+ AC_CHECK_FUNCS(fnmatch)
+fi
+if test "$wxUSE_FILE" = "yes"; then
+ AC_CHECK_FUNCS(fsync)
+fi
dnl the following tests are for Unix(like) systems only
dnl check for available version of iconv()
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
AM_ICONV
LIBS="$LIBICONV $LIBS"
-AC_LANG_RESTORE
+AC_LANG_POP
dnl check for POSIX signals if we need them
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
fi
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_CACHE_CHECK([for sa_handler type], wx_cv_type_sa_handler,
[
])
])
- AC_LANG_RESTORE
+ AC_LANG_POP
AC_DEFINE_UNQUOTED(wxTYPE_SA_HANDLER, $wx_cv_type_sa_handler)
fi
fi
+dnl backtrace() and backtrace_symbols() for wxStackWalker
+if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+ AC_LANG_PUSH(C++)
+
+ AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
+ [
+ AC_TRY_COMPILE([#include <execinfo.h>],
+ [
+ void *trace[1];
+ char **messages;
+
+ backtrace(trace, 1);
+ messages = backtrace_symbols(trace, 1);
+ ],
+ wx_cv_func_backtrace=yes,
+ wx_cv_func_backtrace=no
+ )
+ ]
+ )
+
+
+ if test "$wx_cv_func_backtrace" = "no"; then
+ AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
+ wxUSE_STACKWALKER=no
+ else
+ AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
+ [
+ AC_TRY_LINK([#include <cxxabi.h>],
+ [
+ int rc;
+ __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+ ],
+ wx_cv_func_cxa_demangle=yes,
+ wx_cv_func_cxa_demangle=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_func_cxa_demangle" = "yes"; then
+ AC_DEFINE(HAVE_CXA_DEMANGLE)
+ fi
+ fi
+
+ AC_LANG_POP
+fi
+
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+ AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled])
+ wxUSE_STACKWALKER=no
+fi
+
+
dnl check for the function for temp files creation
AC_CHECK_FUNCS(mkstemp mktemp, break)
AC_TRY_COMPILE(
[
#if defined(__BSD__)
- #include <sys/param.h>
- #include <sys/mount.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
#else
- #include <sys/vfs.h>
+ #include <sys/vfs.h>
#endif
],
[
l += fs.f_blocks;
l += fs.f_bavail;
],
- [
- wx_cv_func_statfs=yes
- ],
- [
- wx_cv_func_statfs=no
- ]
+ wx_cv_func_statfs=yes,
+ wx_cv_func_statfs=no
)
)
if test "$wx_cv_func_statfs" = "yes"; then
+ dnl check whether we have its dcelaration too: some systems (AIX 4) lack it
+ AC_LANG_PUSH(C++)
+ AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
+ AC_TRY_COMPILE(
+ [
+ #if defined(__BSD__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
+ #include <sys/vfs.h>
+ #endif
+ ],
+ [
+ struct statfs fs;
+ statfs("", &fs);
+ ],
+ wx_cv_func_statfs_decl=yes,
+ wx_cv_func_statfs_decl=no
+ )
+ )
+ AC_LANG_POP
+
+ if test "$wx_cv_func_statfs_decl" = "yes"; then
+ AC_DEFINE(HAVE_STATFS_DECL)
+ fi
+
wx_cv_type_statvfs_t="struct statfs"
AC_DEFINE(HAVE_STATFS)
else
dnl
dnl for this check C++ compiler has to be used as passing incompatible
dnl pointers is just a warning and not an error in C
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
AC_TRY_COMPILE(
)
)
- AC_LANG_RESTORE
+ AC_LANG_POP
if test "$wx_cv_type_statvfs_t" != "unknown"; then
AC_DEFINE(HAVE_STATVFS)
dnl check for MT-safe version of strtok (on DEC Alpha, it's ok for C compiler
dnl but not for C++ one - hence change language)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
AC_CHECK_FUNCS(strtok_r)
-AC_LANG_RESTORE
+AC_LANG_POP
dnl check for inet_addr and inet_aton (these may live either in libc, or in
dnl libnsl or libresolv or libsocket)
dnl ---------------------------------------------------------------------------
dnl under MSW (except mingw32) we always have thread support
-CPP_MT_FLAG=
if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
dnl the code below:
THREAD_OPTS="pthreads"
;;
*-hp-hpux* )
- dnl HP-UX aCC only gives a warning, not an error about
- dnl -pthread but it doesn't work and we have to use -lpthread
- dnl there
- if test "x$GCC" != "xyes"; then
- THREAD_OPTS=""
+ if test "x$GCC" = "xyes"; then
+ dnl g++ versions before 3.3.2 don't support -pthread.
+ $CXX -dumpspecs | grep 'pthread:' >/dev/null ||
+ THREAD_OPTS=""
+ else
+ dnl HP-UX aCC (tested with version B3910B A.06.05 [Jul 25
+ dnl 2005]) supports -mt
+ THREAD_OPTS="-mt"
fi
;;
THREADS_CFLAGS="$THREADS_CFLAGS $flag"
fi
- if test "x$THREADS_CFLAGS" != "x"; then
- dnl don't add these options to CPPFLAGS as cpp might not know them
- CFLAGS="$CFLAGS $THREADS_CFLAGS"
- CXXFLAGS="$CXXFLAGS $THREADS_CFLAGS"
- fi
+ dnl don't add these options to CPPFLAGS as cpp might not know them
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS $THREADS_CFLAGS"
fi
fi
if test "$wxUSE_THREADS" = "yes" ; then
AC_CHECK_FUNCS(thr_setconcurrency)
+ dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so
+ dnl wouldn't be found by it
+ AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup,
+ [
+ AC_TRY_COMPILE([#include <pthread.h>
+ void ThreadCleanupFunc(void *p);
+ ],
+ [
+ void *p;
+ pthread_cleanup_push(ThreadCleanupFunc, p);
+ pthread_cleanup_pop(0);
+ ], [
+ wx_cv_func_pthread_cleanup=yes
+ ], [
+ wx_cv_func_pthread_cleanup=no
+ ]
+ )
+ ])
+ if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
+ AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
+ fi
+
AC_CHECK_HEADERS(sched.h)
if test "$ac_cv_header_sched_h" = "yes"; then
AC_CHECK_FUNC(sched_yield,
AC_DEFINE(HAVE_PTHREAD_CANCEL),
AC_MSG_WARN([wxThread::Kill() will not work properly]))
- dnl we don't use pthread_cleanup_push/pop() any more in the code, but I
- dnl the code here for now in case we need it again soon; otherwise it
- dnl should be removed in a couple of months (VZ in Sep 2003)
- dnl
- dnl AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
- dnl [
- dnl AC_TRY_COMPILE([#include <pthread.h>],
- dnl [
- dnl pthread_cleanup_push(NULL, NULL);
- dnl pthread_cleanup_pop(0);
- dnl ], [
- dnl wx_cv_func_pthread_cleanup_push=yes
- dnl ], [
- dnl wx_cv_func_pthread_cleanup_push=no
- dnl ])
- dnl ])
- dnl
- dnl if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
- dnl AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
- dnl fi
+ AC_CHECK_FUNC(pthread_attr_setstacksize,
+ AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE))
dnl mutexattr_t initialization is done in quite different ways on different
dnl platforms, so check for a few things:
[
pthread_mutexattr_t attr;
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- ], [
- wx_cv_type_pthread_mutexattr_t=yes
- ], [
- wx_cv_type_pthread_mutexattr_t=no
- ]
+ ],
+ wx_cv_type_pthread_mutexattr_t=yes,
+ wx_cv_type_pthread_mutexattr_t=no
)
])
if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
+
+ dnl check if we already have the declaration we need, it is not
+ dnl present in some systems' headers
+ AC_CACHE_CHECK([for pthread_mutexattr_settype declaration],
+ wx_cv_func_pthread_mutexattr_settype_decl, [
+ AC_TRY_COMPILE([#include <pthread.h>],
+ [
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ ],
+ wx_cv_func_pthread_mutexattr_settype_decl=yes,
+ wx_cv_func_pthread_mutexattr_settype_decl=no
+ )
+ ])
+ if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
+ AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL)
+ fi
else
dnl don't despair, there may be another way to do it
AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
wx_cv_cflags_mthread,
[
CFLAGS_OLD="$CFLAGS"
- CFLAGS="$CFLAGS -mthreads"
+ CFLAGS="-mthreads $CFLAGS"
AC_TRY_COMPILE([], [],
wx_cv_cflags_mthread=yes,
wx_cv_cflags_mthread=no
if test "$wx_cv_cflags_mthread" = "yes"; then
dnl it does, use it
- CXXFLAGS="$CXXFLAGS -mthreads"
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"
LDFLAGS="$LDFLAGS -mthreads"
else
dnl it doesn't
fi
;;
*-pc-os2*emx )
- CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__"
- CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
LDFLAGS="$LDFLAGS -Zmt"
;;
esac
fi
fi
+AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])
+AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])
+AC_CHECK_FUNC(readdir_r, [ AC_DEFINE(HAVE_READDIR_R) ])
+dnl By preference, we probably should use getaddrinfo which avoids thread
+dnl safety issues and supports IPv6, however there currently is no code
+dnl for it, so testing for it is temporarily disabled and we are restricted
+dnl to gethostbyname_r/gethostbyaddr_r and getservbyname_r
+
+AC_LANG_PUSH(C++)
+dnl AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO), [
+ dnl no getaddrinfo, so check for gethostbyname_r and
+ dnl related functions (taken from python's configure.in)
+ dnl sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments
+ AX_FUNC_WHICH_GETHOSTBYNAME_R
+ if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \
+ "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
+ AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ])
+ fi
+ dnl A similar test for getservbyname_r
+ dnl I'm tempted to just not do this test which is taking much time and
+ dnl do something similar as for gethostbyaddr_r, but OTOH the macro
+ dnl doing the test already exists, so using it is easy enough. - SN
+ AC_raf_FUNC_WHICH_GETSERVBYNAME_R
+ if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \
+ "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
+ AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ])
+ fi
+ dnl For gethostbyaddr_r, we currently do no separate test, instead, we
+ dnl silently assume it's available exactly if gethostbyname_r is
+ dnl available and always requires two more arguments than
+ dnl gethostbyname_r.
+ dnl (also, I'm lazy and there no m4 file that's ready for use for this
+ dnl function, although it should be easy to rewrite the gethostbyname_r
+ dnl check to fit this case, if it's really needed. - SN )
+dnl ]
+dnl )
+AC_LANG_POP
+
if test "$wxUSE_THREADS" = "yes"; then
AC_DEFINE(wxUSE_THREADS)
if test "$ac_cv_func_strtok_r" = "yes"; then
AC_MSG_CHECKING(if -D_REENTRANT is needed)
if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE)
fi
-WXDEBUG=
-
+dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
+dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
+DEBUG_CFLAGS=
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
- WXDEBUG="-g"
+ DEBUG_CFLAGS="-g"
wxUSE_OPTIMISE=no
fi
if test "$wxUSE_DEBUG_GDB" = "yes" ; then
wxUSE_DEBUG_INFO=yes
- WXDEBUG="-ggdb"
+ if test "$GCC" = yes; then
+ DEBUG_CFLAGS="-ggdb"
+ fi
fi
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
AC_DEFINE(WXDEBUG)
- WXDEBUG_DEFINE="-D__WXDEBUG__"
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
else
if test "$wxUSE_GTK" = 1 ; then
- WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+ if test "x$wxGTK_VERSION" = "x1" ; then
+ CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
+ fi
fi
fi
fi
if test "$wxUSE_DMALLOC" = "yes" ; then
- DMALLOC_LIBS="-ldmalloc"
+ DMALLOC_LIBS="-ldmallocthcxx"
fi
-PROFILE=
+dnl cc/cxx/ld option for profiling
+PROFILE_FLAGS=
if test "$wxUSE_PROFILE" = "yes" ; then
- PROFILE=" -pg"
+ PROFILE_FLAGS=" -pg"
fi
-CODE_GEN_FLAGS=
-CODE_GEN_FLAGS_CXX=
if test "$GCC" = "yes" ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -fpermissive"
fi
dnl Ian Brown <ian.brown@printsoft.de> reports that versions of gcc before
dnl TODO: test for the gcc version here (how?)
case "${host}" in
powerpc*-*-aix* )
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mminimal-toc"
;;
*-hppa* )
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
+ WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -ffunction-sections"
;;
esac
fi
-OPTIMISE=
+dnl C/C++ compiler option for optimization (supposed to be the same for both)
+OPTIMISE_CFLAGS=
if test "$wxUSE_OPTIMISE" = "no" ; then
if test "$GCC" = yes ; then
dnl use -O0 because compiling with it is faster than compiling with no
dnl optimization options at all (at least with g++ 3.2)
- OPTIMISE="-O0"
+ OPTIMISE_CFLAGS="-O0"
fi
else
if test "$GCC" = yes ; then
- OPTIMISE="-O2"
-
- dnl VZ: does anybody know what does this do??
- case "${host}" in
- i586-*-*|i686-*-* )
- OPTIMISE="${OPTIMISE} "
- ;;
- esac
+ dnl Switch on optimisation but keep strict-aliasing off for now (see
+ dnl -fstrict-aliasing in the gcc manual). When it is switched back on
+ dnl consider using -Wstrict-aliasing=2.
+ OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
else
- OPTIMISE="-O"
+ OPTIMISE_CFLAGS="-O"
fi
fi
dnl compatibility level
dnl ---------------------------------------------------------------------------
-if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
+if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
- WXWIN_COMPATIBILITY_2_4="yes"
+ WXWIN_COMPATIBILITY_2_6="yes"
fi
-if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
+if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
fi
dnl ---------------------------------------------------------------------------
if test "$USE_DARWIN" = 1; then
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
HAVE_DL_FUNCS=1
+ elif test "$USE_DOS" = 1; then
+ HAVE_DL_FUNCS=0
else
dnl the test is a bit complicated because we check for dlopen() both with
dnl and without -ldl and we also try to find shl_load() if there is no
if test "$HAVE_DL_FUNCS" = 0; then
if test "$HAVE_SHL_FUNCS" = 0; then
- if test "$USE_UNIX" = 1; then
+ if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then
AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
wxUSE_DYNAMIC_LOADER=no
wxUSE_DYNLIB_CLASS=no
AC_DEFINE(wxUSE_TIMER)
fi
+dnl Unix implementation needs additional checks because audio support
+dnl comes in many favours:
+if test "$USE_UNIX" = "1" ; then
+ dnl it's not enough to check for just the header because OSS under NetBSD
+ dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+ dnl whether we need -lossaudio at link-time
+ AC_CACHE_CHECK([for ioctl() in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+ AC_TRY_LINK([
+ #include <sys/soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SYNC, 0);
+ ],
+ ac_cv_header_sys_soundcard=yes,
+ [
+ saveLibs="$LIBS"
+ LIBS="$saveLibs -lossaudio"
+ AC_TRY_LINK([
+ #include <sys/soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SYNC, 0);
+ ],
+ ac_cv_header_sys_soundcard=yes,
+ [
+ LIBS="$saveLibs"
+ ac_cv_header_sys_soundcard=no
+ ]
+ )
+ ]
+ )
+ ])
+
+ if test "$ac_cv_header_sys_soundcard" = "yes"; then
+ AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
+ else
+ DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
+ fi
+fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
- dnl Unix implementation needs additional checks because audio support
- dnl comes in many favours:
if test "$USE_UNIX" = "1" ; then
- AC_CHECK_HEADERS([sys/soundcard.h])
-
if test "$wxUSE_LIBSDL" != "no"; then
AM_PATH_SDL([1.2.0],
[
EXTRALIBS_SDL="$SDL_LIBS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_LIBSDL)
],
[wxUSE_LIBSDL="no"])
fi
fi
fi
-
+
AC_DEFINE(wxUSE_SOUND)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
if test "$WXGTK20" = 1; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
-
- PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
+
+ PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
[libgnomeprintui-2.2 >= 2.8],
[
dnl EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
- CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
+ CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_LIBGNOMEPRINT)
],
[
fi
fi
+if test "$WXGTK20" = 1; then
+ if test "$wxUSE_LIBHILDON" = "yes" ; then
+ PKG_CHECK_MODULES(HILDON,
+ [hildon-lgpl >= 0.9],
+ [
+ EXTRALIBS_HILDON="$HILDON_LIBS"
+ CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
+ AC_DEFINE(wxUSE_LIBHILDON)
+ ],
+ [
+ AC_MSG_WARN([libhildon_lgpl not found])
+ wxUSE_LIBHILDON="no"
+ ]
+ )
+ fi
+fi
if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
AC_DEFINE(wxUSE_CMDLINE_PARSER)
AC_DEFINE(wxUSE_FS_ZIP)
fi
+if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
+ AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+fi
+
if test "$wxUSE_ZIPSTREAM" = "yes"; then
- AC_DEFINE(wxUSE_ZIPSTREAM)
+ if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
+ AC_MSG_WARN(wxZip requires wxArchive... disabled)
+ elif test "$wxUSE_ZLIB" = "no"; then
+ AC_MSG_WARN(wxZip requires wxZlib... disabled)
+ else
+ AC_DEFINE(wxUSE_ZIPSTREAM)
+ fi
fi
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
- AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
+ if test "$USE_UNIX" != 1; then
+ AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
+ wxUSE_ON_FATAL_EXCEPTION=no
+ else
+ AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
+ fi
+fi
+
+if test "$wxUSE_STACKWALKER" = "yes"; then
+ AC_DEFINE(wxUSE_STACKWALKER)
+fi
+
+if test "$wxUSE_DEBUGREPORT" = "yes"; then
+ if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+ AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
+ wxUSE_DEBUGREPORT=no
+ else
+ AC_DEFINE(wxUSE_DEBUGREPORT)
+ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+ fi
+ fi
fi
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
AC_DEFINE(wxUSE_STD_IOSTREAM)
fi
+if test "$wxUSE_STD_STRING" = "yes"; then
+ AC_DEFINE(wxUSE_STD_STRING)
+fi
+
+if test "$wxUSE_STDPATHS" = "yes"; then
+ AC_DEFINE(wxUSE_STDPATHS)
+fi
+
if test "$wxUSE_TEXTBUFFER" = "yes"; then
AC_DEFINE(wxUSE_TEXTBUFFER)
fi
AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
else
AC_DEFINE(wxUSE_CONFIG)
+ AC_DEFINE(wxUSE_CONFIG_NATIVE)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
fi
fi
if test "$wxUSE_LOGDIALOG" = "yes"; then
AC_DEFINE(wxUSE_LOG_DIALOG)
fi
+
+ dnl the keyboard sample requires wxUSE_LOG
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard"
fi
if test "$wxUSE_LONGLONG" = "yes"; then
AC_DEFINE(wxUSE_GEOMETRY)
fi
-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
- AC_DEFINE(wxUSE_DIALUP_MANAGER)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
-fi
-
if test "$wxUSE_STREAMS" = "yes" ; then
AC_DEFINE(wxUSE_STREAMS)
fi
dnl ---------------------------------------------------------------------------
dnl time/date functions
-dnl ------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
if test "$wxUSE_DATETIME" = "yes"; then
- dnl check for strptime
+ dnl check for strptime and for its declaration as some systems lack it
AC_CHECK_FUNCS(strptime)
+ if test "$ac_cv_func_strptime" = "yes"; then
+ AC_CACHE_CHECK([for strptime declaration], wx_cv_func_strptime_decl,
+ [
+ AC_LANG_PUSH(C++)
+ AC_TRY_COMPILE(
+ [
+ #include <time.h>
+ ],
+ [
+ struct tm t;
+ strptime("foo", "bar", &t);
+ ],
+ wx_cv_func_strptime_decl=yes,
+ wx_cv_func_strptime_decl=no
+ )
+ AC_LANG_POP
+ ]
+ )
+ fi
+ if test "$wx_cv_func_strptime_decl" = "yes"; then
+ AC_DEFINE(HAVE_STRPTIME_DECL)
+ fi
dnl check for timezone variable
dnl doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
wx_cv_func_gettimeofday_has_2_args,
[
dnl on some _really_ old systems it takes only 1 argument
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_TRY_COMPILE(
[
]
)
)
- AC_LANG_RESTORE
+ AC_LANG_POP
])
if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
dnl converting between incompatible pointer types, so
dnl try to use it to get the correct behaviour at
dnl least with gcc (otherwise we'd always use size_t)
- CFLAGS_OLD="$CFLAGS"
+ CXXFLAGS_OLD="$CXXFLAGS"
if test "$GCC" = yes ; then
- CFLAGS="$CFLAGS -Werror"
+ CXXFLAGS="-Werror $CXXFLAGS"
fi
AC_TRY_COMPILE(
)
)
- CFLAGS="$CFLAGS_OLD"
+ CXXFLAGS="$CXXFLAGS_OLD"
]
)
])
wxUSE_SOCKETS=no
AC_MSG_WARN([Couldn't find socklen_t synonym for this system])
else
- AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
+ AC_DEFINE_UNQUOTED(WX_SOCKLEN_T, $wx_cv_type_getsockname3)
fi
dnl Do this again for getsockopt as it may be different
AC_CACHE_CHECK([what is the type of the fifth argument of getsockopt],
dnl converting between incompatible pointer types, so
dnl try to use it to get the correct behaviour at
dnl least with gcc (otherwise we'd always use size_t)
- CFLAGS_OLD="$CFLAGS"
+ CXXFLAGS_OLD="$CXXFLAGS"
if test "$GCC" = yes ; then
- CFLAGS="$CFLAGS -Werror"
+ CXXFLAGS="-Werror $CXXFLAGS"
fi
AC_TRY_COMPILE(
)
)
- CFLAGS="$CFLAGS_OLD"
+ CXXFLAGS="$CXXFLAGS_OLD"
]
)
])
fi
else
if test "$wxUSE_FS_INET" = "yes"; then
- AC_MSG_WARN([HTTP filesystem require protocol classes... disabled])
+ AC_MSG_WARN([HTTP filesystem require protocol classes... disabled])
wxUSE_FS_INET="no"
fi
fi
dnl Joystick support
dnl ---------------------------------------------------------------------------
-if test "$wxUSE_GUI" = "yes"; then
+if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
+ wxUSE_JOYSTICK=no
- if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
- AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
- wxUSE_JOYSTICK=no
- fi
-
- dnl under MSW we always have joystick support
- if test "$TOOLKIT" != "MSW"; then
- if test "$wxUSE_JOYSTICK" = "yes"; then
- dnl joystick support is only for Linux 2.1.x or greater
- 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)
- fi
+ dnl under MSW we always have joystick support
+ if test "$TOOLKIT" = "MSW"; then
+ wxUSE_JOYSTICK=yes
+
+ dnl mac only available on darwin
+ elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+ if test "$USE_DARWIN" = 1; then
+ dnl check for a bug in the headers, some have bad setEventCallout
+ AC_MSG_CHECKING([headers have declarations needed for joystick support])
+ AC_LANG_PUSH(C++)
+ AC_TRY_COMPILE( [ #include <IOKit/hid/IOHIDLib.h> ],
+ [ IOHIDQueueInterface *qi = NULL;
+ IOHIDCallbackFunction cb = NULL;
+ qi->setEventCallout(NULL, cb, NULL, NULL); ],
+ [ wxUSE_JOYSTICK=yes ]
+ )
+ AC_LANG_POP
+ AC_MSG_RESULT($wxUSE_JOYSTICK)
fi
+
+ dnl joystick support is only for Linux 2.1.x or greater
+ else
+ AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
fi
if test "$wxUSE_JOYSTICK" = "yes"; then
AC_DEFINE(wxUSE_JOYSTICK)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+ else
+ AC_MSG_WARN(Joystick not supported by this system... disabled)
fi
fi
AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
fi
+dnl ---------------------------------------------------------------------------
+dnl wxMetafile availability
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_METAFILE" = "yes"; then
+ if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
+ AC_MSG_WARN([wxMetafile is not available on this system... disabled])
+ wxUSE_METAFILE=no
+ fi
+fi
+
dnl ---------------------------------------------------------------------------
dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
dnl ---------------------------------------------------------------------------
if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH(C++)
AC_MSG_CHECKING([if g++ requires -fvtable-thunks])
AC_TRY_COMPILE([#include <windows.h>
[],
[AC_MSG_RESULT(no)],
[AC_MSG_RESULT(yes)
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"])
- AC_LANG_RESTORE
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"])
+ AC_LANG_POP
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
if test "$wxUSE_OLE" = "yes" ; then
AC_DEFINE(wxUSE_OLE)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
fi
fi
fi
if test "$wxUSE_IPC" = "yes"; then
- if test "$wxUSE_SOCKETS" != "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then
AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
+ wxUSE_IPC=no
fi
- AC_DEFINE(wxUSE_IPC)
+ if test "$wxUSE_IPC" = "yes"; then
+ AC_DEFINE(wxUSE_IPC)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+ fi
+fi
+
+if test "$wxUSE_DATAOBJ" = "yes"; then
+ if test "$wxUSE_MGL" = 1; then
+ AC_MSG_WARN([wxDataObject not yet supported under MGL... disabled])
+ wxUSE_DATAOBJ=no
+ else
+ AC_DEFINE(wxUSE_DATAOBJ)
+ fi
+else
+ AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
+ wxUSE_CLIPBOARD=no
+ wxUSE_DRAG_AND_DROP=no
fi
if test "$wxUSE_CLIPBOARD" = "yes"; then
if test "$wxUSE_CLIPBOARD" = "yes"; then
AC_DEFINE(wxUSE_CLIPBOARD)
-
- dnl required by clipboard code in configuration check
- AC_DEFINE(wxUSE_DATAOBJ)
fi
fi
AC_DEFINE(wxUSE_SPLINES)
fi
+if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
+ AC_DEFINE(wxUSE_MOUSEWHEEL)
+fi
+
dnl ---------------------------------------------------------------------------
dnl GUI controls
dnl ---------------------------------------------------------------------------
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
+if test "$wxUSE_DATEPICKCTRL" = "yes"; then
+ AC_DEFINE(wxUSE_DATEPICKCTRL)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_DISPLAY" = "yes"; then
AC_DEFINE(wxUSE_DISPLAY)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
fi
if test "$wxUSE_GAUGE" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
+if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
+ AC_DEFINE(wxUSE_DATAVIEWCTRL)
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
+fi
+
if test "$wxUSE_IMAGLIST" = "yes"; then
AC_DEFINE(wxUSE_IMAGLIST)
fi
if test "$wxUSE_LISTBOX" = "yes"; then
AC_DEFINE(wxUSE_LISTBOX)
USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
fi
if test "$wxUSE_LISTCTRL" = "yes"; then
fi
if test "$wxUSE_STATUSBAR" = "yes"; then
+ dnl this will get undefined in wx/chkconf.h if it's not supported
+ AC_DEFINE(wxUSE_NATIVE_STATUSBAR)
AC_DEFINE(wxUSE_STATUSBAR)
USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
fi
-if test "$wxUSE_TABDIALOG" = "yes"; then
+if test "$wxUSE_TAB_DIALOG" = "yes"; then
AC_DEFINE(wxUSE_TAB_DIALOG)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
fi
if test "$wxUSE_TEXTCTRL" = "yes"; then
if test "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
wxUSE_TOGGLEBTN=no
- else
- if test "$wxUSE_PM" = 1; then
- AC_MSG_WARN([Toggle button not yet supported under PM... disabled])
- wxUSE_TOGGLEBTN=no
- fi
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
fi
fi
+if test "$wxUSE_TREEBOOK" = "yes"; then
+ AC_DEFINE(wxUSE_TREEBOOK)
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_TOOLBOOK" = "yes"; then
+ AC_DEFINE(wxUSE_TOOLBOOK)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_TREECTRL" = "yes"; then
if test "$wxUSE_IMAGLIST" = "yes"; then
AC_DEFINE(wxUSE_TREECTRL)
AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
else
AC_DEFINE(wxUSE_POPUPWIN)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
USES_CONTROLS=1
fi
fi
fi
+if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+ AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled])
+ else
+ AC_DEFINE(wxUSE_DIALUP_MANAGER)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+ fi
+fi
+
if test "$wxUSE_TIPWINDOW" = "yes"; then
if test "$wxUSE_PM" = 1; then
AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
fi
+if test "$wxUSE_DC_CACHEING" = "yes"; then
+ AC_DEFINE(wxUSE_DC_CACHEING)
+fi
+
if test "$wxUSE_DRAGIMAGE" = "yes"; then
AC_DEFINE(wxUSE_DRAGIMAGE)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
if test "$wxUSE_WEBKIT" = "yes"; then
if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -x objective-c++"
+ CPPFLAGS="-x objective-c++ $CPPFLAGS"
AC_CHECK_HEADER([WebKit/HIWebView.h],
[
AC_DEFINE(wxUSE_WEBKIT)
LIBS=" -lunicows $LIBS"
fi
+USE_RICHTEXT=0
+if test "$wxUSE_RICHTEXT" = "yes"; then
+ AC_DEFINE(wxUSE_RICHTEXT)
+ USE_RICHTEXT=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
+fi
+
dnl ---------------------------------------------------------------------------
dnl wxImage options
dnl ---------------------------------------------------------------------------
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
fi
+dnl ---------------------------------------------------------------------------
+dnl wxMediaCtrl
+dnl ---------------------------------------------------------------------------
+
+USE_MEDIA=0
+
+if test "$wxUSE_MEDIACTRL" = "yes"; then
+ dnl -----------------------------------------------------------------------
+ dnl GStreamer
+ dnl -----------------------------------------------------------------------
+ if test "$wxUSE_GTK" = 1; then
+ wxUSE_GSTREAMER="yes"
+
+ dnl -------------------------------------------------------------------
+ dnl Test for at least 0.8 gstreamer module from pkg-config
+ dnl Even totem doesn't accept 0.9 evidently.
+ dnl
+ dnl So, we first check to see if 0.10 if available - if not we
+ dnl try the older 0.8 version
+ dnl -------------------------------------------------------------------
+ GST_VERSION_MAJOR=0
+ GST_VERSION_MINOR=10
+ GST_VERSION_RELEASE=0
+ GSTREAMER_REQ=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_RELEASE
+ GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+
+ if test "$wxUSE_GSTREAMER8" = "no"; then
+ PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR
+ gstreamer-plugins-base-$GST_MAJORMINOR
+ gconf-2.0,
+ [
+ CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+ LIBS="$LIBS $GST_LIBS -lgstinterfaces-$GST_MAJORMINOR"
+ ],
+ [
+ GST_VERSION_MINOR=8
+ ])
+ else
+ GST_VERSION_MINOR=8
+ fi
+
+ GSTREAMER_REQ=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_RELEASE
+ GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+
+ if test x$GST_VERSION_MINOR = x8; then
+ PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR
+ gstreamer-interfaces-$GST_MAJORMINOR
+ gstreamer-gconf-$GST_MAJORMINOR,
+ [
+ CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+ LIBS="$LIBS $GST_LIBS"
+ ],
+ [
+ AC_MSG_WARN([Proper GStreamer .8/.10 installation not found])
+ wxUSE_GSTREAMER="no"
+ ])
+ fi
+
+
+ if test "$wxUSE_GSTREAMER" = "yes"; then
+ AC_DEFINE(wxUSE_GSTREAMER)
+ AC_MSG_RESULT([GStreamer detection successful])
+ fi
+ fi
+ USE_MEDIA=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
+ AC_DEFINE(wxUSE_MEDIACTRL)
+fi
+
dnl ---------------------------------------------------------------------------
dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
dnl ---------------------------------------------------------------------------
if test "$wxUSE_HTML" = "yes" ; then
CORE_GUI_LIBS="html $CORE_GUI_LIBS"
fi
+if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+ CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
+fi
if test "$wxUSE_XRC" = "yes" ; then
CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
fi
AC_SUBST(CORE_BASE_LIBS)
AC_SUBST(CORE_GUI_LIBS)
-
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
fi
fi
if test "$wxUSE_COCOA" = 1 ; then
- LDFLAGS="$LDFLAGS -framework Cocoa"
+ LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+ if test "$wxUSE_MEDIACTRL" = "yes"; then
+ LDFLAGS="$LDFLAGS -framework QuickTime"
+ fi
+fi
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
+ LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi
dnl FIXME: should this be covered by the conditional above
dnl TODO add checks that these samples will really compile (i.e. all the
dnl library features they need are present)
- dnl TODO some samples are never built so far:
- dnl ipc, mfc, nativdlg, oleauto, ownerdrw
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
- drawing dynamic erase event exec font image \
- minimal propsize rotate shaped widgets render"
+ dnl TODO some samples are never built so far: mfc (requires VC++)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
+ dynamic erase event exec font image minimal mobile \
+ mobile/wxedit mobile/styles propsize render \
+ rotate shaped vscroll widgets"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
fi
+ if test "$TOOLKIT" = "MSW"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
+ if test "$wxUSE_UNIVERSAL" != "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+ fi
+ fi
+ if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw"
+ fi
else
SAMPLES_SUBDIRS="console"
fi
-dnl all -I options we must pass to the compiler
+dnl C/C++ compiler options used to compile wxWidgets
+dnl
+dnl check for icc before gcc as icc is also recognized as gcc
+if test "x$INTELCC" = "xyes" ; then
+ dnl Warnings which can't be easily suppressed in C code are disabled:
+ dnl
+ dnl remark #810: conversion from "x" to "y" may lose significant bits
+ dnl remark #869: parameter "foo" was never referenced
+ dnl remark #1572: floating-point equality and inequality comparisons
+ dnl are unreliable
+ dnl remark #1684: conversion from pointer to same-sized integral type
+ dnl
+ dnl (for others see below)
+ CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+elif test "$GCC" = yes ; then
+ CWARNINGS="-Wall -Wundef"
+fi
+
+if test "x$INTELCXX" = "xyes" ; then
+ dnl Intel compiler gives some warnings which simply can't be worked
+ dnl around or of which we have too many (810, 869) so it's impractical to
+ dnl keep them enabled even if in theory it would be nice and some others
+ dnl (279) are generated for standard macros and so there is nothing we can
+ dnl do about them
+ dnl
+ dnl remark #279: controlling expression is constant
+ dnl remark #383: value copied to temporary, reference to temporary used
+ dnl remark #444: destructor for base class "xxx" is not virtual
+ dnl remark #810: conversion from "x" to "y" may lose significant bits
+ dnl remark #869: parameter "foo" was never referenced
+ dnl remark #981: operands are evaluated in unspecified order
+ dnl remark #1418: external definition with no prior declaration
+ dnl remark #1419: external declaration in primary source file
+ CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+elif test "$GXX" = yes ; then
+ dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
+ CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
+fi
+
+
+dnl combine everything together and remove the extra white space while doing it
+WXCONFIG_CFLAGS=`echo $WXCONFIG_CFLAGS`
+WXCONFIG_CXXFLAGS=`echo $WXCONFIG_CFLAGS $WXCONFIG_CXXFLAGS`
+
+
+dnl add -I options we use during library compilation
dnl
dnl note that the order is somewhat important: wxWidgets headers should
dnl come first and the one with setup.h should be before $(top_srcdir)/include
dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
dnl CodeWarrior):
-INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
--I\${top_srcdir}/include $TOOLKIT_INCLUDE"
+CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
+ -I\\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
+ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \
+ $CPPFLAGS `
-dnl C/C++ compiler options used to compile wxWidgets
-if test "$GXX" = yes ; then
- dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
- CWARNINGS="-Wall"
- CXXWARNINGS="$CWARNINGS -Wno-ctor-dtor-privacy"
- dnl should enable this one day...
- dnl CXXWARNINGS="-Wall -Werror"
-fi
+C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
+CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
+CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS `
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
+dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config
+dnl only stuff to it
+WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
+
+
+if test "x$MWCC" = "xyes"; then
+ dnl Correct MW 8.3 to be more similar to GCC. In particular we
+ dnl must use <regex.h> from system not our local copy on OS X,
+ dnl but must use local not system on OS 9.
+ dnl The following should make all -I paths usable for <> includes
+ dnl while first checking in real system paths. With 8.3 using
+ dnl -gccincludes it will actually check local paths before system
+ dnl even for <> which is totally wrong.
+
+ dnl Note that because this absolutely needs to be before any -I
+ dnl that we have to tack it on to the end of the compiler commandline.
+ CC="$CC -cwd source -I-"
+ CXX="$CXX -cwd source -I-"
+fi
-dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
-CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS`
-CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`
-
LIBS=`echo $LIBS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_ODBC="$ODBC_LINK"
if test "$wxUSE_GUI" = "yes"; then
- EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
+ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEPRINT`
fi
if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
fi
-
-LDFLAGS="$LDFLAGS $PROFILE"
-dnl wxGTK does not need TOOLKIT includes in wx-config
-if test "$wxUSE_GTK" = 1; then
- WXCONFIG_INCLUDE=
-else
- WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
-fi
+LDFLAGS="$LDFLAGS $PROFILE_FLAGS"
-WXCONFIG_EXTRALIBS="$LIBS"
+WXCONFIG_LIBS="$LIBS"
dnl wx-config must output builtin 3rd party libs in --libs in static build:
if test "$wxUSE_REGEX" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}"
+ wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"
fi
if test "$wxUSE_EXPAT" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty expat"
+ wxconfig_3rdparty="expat $wxconfig_3rdparty"
fi
if test "$wxUSE_ODBC" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+ wxconfig_3rdparty="odbc $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+ wxconfig_3rdparty="tiff $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBJPEG" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+ wxconfig_3rdparty="jpeg $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBPNG" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty png"
+ wxconfig_3rdparty="png $wxconfig_3rdparty"
fi
if test "$wxUSE_ZLIB" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty zlib"
-fi
-if test "$wxUSE_ODBC" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+ wxconfig_3rdparty="zlib $wxconfig_3rdparty"
fi
for i in $wxconfig_3rdparty ; do
- WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+ WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
done
USE_ODBC=0
fi
+if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+ USE_QA=1
+else
+ USE_QA=0
+fi
+
if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
OFFICIAL_BUILD=1
else
AC_SUBST(EXTRALIBS_SDL)
AC_SUBST(WITH_PLUGIN_SDL)
AC_SUBST(EXTRALIBS_GNOMEPRINT)
+AC_SUBST(EXTRALIBS_HILDON)
AC_SUBST(UNICODE)
AC_SUBST(BUILD)
AC_SUBST(DEBUG_INFO)
;;
esac
-AC_BAKEFILE
+if test "$wxUSE_WINE" = "yes"; then
+ BAKEFILE_FORCE_PLATFORM=win32
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl Add Universal binary support
+dnl Note we don't do this earlier because adding these cpp/ld flags could
+dnl cause configure tests to fail.
+dnl ---------------------------------------------------------------------------
+if test "$wxUSE_MAC" = 1 ; then
+ if test "$wxUSE_UNIVERSAL_BINARY" = "yes" ; then
+ CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 $CXXFLAGS"
+ CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 $CFLAGS"
+ LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 $LDFLAGS"
+ bk_use_pch=no
+ fi
+ # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)?
+ # The makefile currently uses AR and RANLIB, which libtool apparently supercedes.
+ # TODO: how can we avoid a hardwired reference to the SDK, above? (Someone used -lSystemStubs to avoid it)
+fi
+
+AC_BAKEFILE([m4_include(autoconf_inc.m4)])
+
+dnl HACK ALERT!!
+dnl For now, we need to alter bk-deps not to generate deps
+dnl when we've configured a Universal binary build.
+dnl The next version of Bakefile will have the correct fix for this
+dnl at which time, this hack can be removed.
+
+if test "$wxUSE_MAC" = 1 ; then
+ if test "$wxUSE_UNIVERSAL_BINARY" = "yes" ; then
+ sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
+ mv temp bk-deps
+ chmod +x bk-deps
+ fi
+fi
if test "$wxUSE_SHARED" = "yes"; then
EXE_LINKER="$CXX -o"
fi
-
-dnl Check to see if the platform always requires NO_GCC_PRAGMA
-GCC_PRAGMA_FLAGS=""
+if test "$wxUSE_OMF" = "yes"; then
case "${host}" in
- powerpc-*-darwin* )
- dnl Some Apple's GCC version are broken and can't handle the
- dnl pragmas:
- GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
- ;;
- *-*-mingw32* )
- dnl MinGW GCC versions >= 3.2 have problems with
- dnl static member of classes derived from templates
- dnl in combination with #pragma interface/implementation
- dnl (the test case uses 4 files)
- dnl ... and with exceptions handling (undefined symbols needed
- dnl to correctly calls dtors when unwinding) as well
- if test "$wxUSE_STL" = "yes" -o \
- "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
- "$wxUSE_NO_RTTI" != "yes"; then
- AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
- AC_TRY_COMPILE([],
- [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
- #error "Not GCC 3.2 or greater"
- #endif
- ],
- [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
- AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])])
- fi
- ;;
- *-pc-os2_emx | *-pc-os2-emx )
- dnl GCC versions ported to OS/2 have similar problems with
- dnl static member of classes in combination with STL and
- dnl pragma interface/implementation
- if test "$wxUSE_STL" = "yes"; then
- AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA])
- AC_TRY_COMPILE([],
- [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
- #error "Not GCC 3.2 or greater"
- #endif
- ],
- [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
- AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])])
- fi
- ;;
+ *-pc-os2_emx | *-pc-os2-emx )
+ LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
+ LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+ WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+ ;;
esac
+fi
-dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
-PCH_FLAGS=""
+dnl find out if the compiler supports PCH
+dnl
+dnl TODO: this should be in bakefile
if test $GCC_PCH = 1 ; then
- if test "x$GCC_PRAGMA_FLAGS" = "x"; then
- PCH_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
- else
- PCH_FLAGS="-DWX_PRECOMP"
- fi
+ CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
fi
-CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
-
+dnl TOOLCHAIN_DEFS should be used for both wx and client code
+WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
dnl for convenience, sort the samples in alphabetical order
dnl
AC_SUBST(WX_LIBRARY_BASENAME_NOGUI)
AC_SUBST(WX_LIBRARY_BASENAME_GUI)
-dnl debugging options
-AC_SUBST(WXDEBUG_DEFINE)
-
dnl toolkit options
AC_SUBST(USE_GUI)
AC_SUBST(AFMINSTALL)
AC_SUBST(TOOLKIT_DIR)
AC_SUBST(TOOLCHAIN_NAME)
AC_SUBST(TOOLCHAIN_FULLNAME)
-AC_SUBST(TOOLCHAIN_DEFS)
-AC_SUBST(TOOLCHAIN_DLL_DEFS)
dnl wx-config options
AC_SUBST(host_alias)
AC_SUBST(WX_SUBVERSION)
AC_SUBST(WX_CHARTYPE)
AC_SUBST(WX_DEBUGTYPE)
-AC_SUBST(WXCONFIG_EXTRALIBS)
-AC_SUBST(WXCONFIG_INCLUDE)
+
+dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
+dnl building the library itself, we also have WXCONFIG_-prefixed variants which
+dnl are used when building the libraries using the library
+dnl
+dnl so put anything which should be used only during the library build in, e.g.
+dnl CXXFLAGS, but put everything else (by default) into WXCONFIG_CXXFLAGS
+dnl
+dnl and, finally, for some things which should be only used by wx-config but
+dnl not during the library compilation, use WXCONFIG_ONLY_CPPFLAGS which is
+dnl added to WXCONFIG_CPPFLAGS after adding the latter to CPPFLAGS
+AC_SUBST(WXCONFIG_CPPFLAGS)
+AC_SUBST(WXCONFIG_CFLAGS)
+AC_SUBST(WXCONFIG_CXXFLAGS)
+
+AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WXCONFIG_LDFLAGS_GUI)
-AC_SUBST(WX_LARGEFILE_FLAGS)
-AC_SUBST(GCC_PRAGMA_FLAGS)
-AC_SUBST(CODE_GEN_FLAGS)
-AC_SUBST(CODE_GEN_FLAGS_CXX)
+AC_SUBST(WXCONFIG_RESFLAGS)
AC_SUBST(EXE_LINKER)
dnl distribution vars
dnl additional resurces settings
AC_SUBST(RESCOMP)
+AC_SUBST(WINDRES)
+AC_SUBST(REZ)
AC_SUBST(RESFLAGS)
AC_SUBST(RESPROGRAMOBJ)
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
dnl additional for Mac OS X
AC_SUBST(DEREZ)
AC_SUBST(LIBWXMACRES)
-AC_SUBST(MACRESCOMP)
+AC_SUBST(POSTLINK_COMMAND)
AC_SUBST(MACSETFILE)
-AC_SUBST(MACRESWXCONFIG)
dnl other tools
AC_SUBST(GCC)
AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
+if test "$USE_WIN32" = 1; then
+ AC_CONFIG_COMMANDS(
+ [
+ rcdefs.h
+ ],
+ [
+ mkdir -p $outdir &&
+ $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
+ ],
+ [
+ CPP="$CPP"
+ infile="$srcdir/include/wx/msw/genrcdefs.h"
+ outdir="lib/wx/include/$TOOLCHAIN_FULLNAME/wx/msw"
+ ]
+ )
+fi
+
AC_CONFIG_FILES([ lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in ],
[ chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ],
[ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ])
AC_CONFIG_FILES([ version-script Makefile ])
-AC_CONFIG_COMMANDS([ wx-config
- ],
+AC_CONFIG_COMMANDS([wx-config],
[ rm -f wx-config
${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
],
dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
dnl AC_CONFIG_LINKS([ contrib/include ])
-
+if test "$wxWITH_SUBDIRS" != "no"; then
dnl Configure samples, contrib etc. directories, but only if they are present:
if test "$wxUSE_GUI" = "yes"; then
SUBDIRS="samples demos utils contrib"
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
- else dnl assume that everything compiles for utils &c
- makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+ else
+ dnl assume that everything compiles for utils &c
+ dnl any that shouldn't be built can be added to
+ dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
+ disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
+ eval "disabled=\$$disabled_var"
+ disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
fi
else dnl we build wxBase only
dnl don't take all samples/utils, just those which build with
done
fi
done
-
+fi dnl wxWITH_SUBDIRS
AC_OUTPUT
echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWidgets compatibility should be enabled?"
-echo " wxWidgets 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
-echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
+echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-no}"
+echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-yes}"
echo " Which libraries should wxWidgets use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " libmspack ${wxUSE_LIBMSPACK}"
echo " sdl ${wxUSE_LIBSDL}"
echo " gnomeprint ${wxUSE_LIBGNOMEPRINT-none}"
+echo " hildon ${wxUSE_LIBHILDON-none}"
echo ""
projects / wxWidgets.git / blobdiff