X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a92d200e102e6c79ce085153bd0a2f6c554c32d..32d4bfd16c554ba060ccee9236abb8e7ff0e913a:/configure.in diff --git a/configure.in b/configure.in index fd9e0c5f96..5e6a6fa14a 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -dnl the file passed to AC_INIT should be speicific to our package +dnl the file passed to AC_INIT should be specific to our package AC_INIT(wx-config.in) AC_CANONICAL_HOST @@ -28,7 +28,7 @@ dnl WX_BINARY_AGE += 1 dnl dnl if any functions have been added, do: dnl -dnl WX_INTERFACE_AGE = 1 +dnl WX_INTERFACE_AGE = 0 WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 @@ -83,6 +83,9 @@ USE_CYGWIN= USE_MINGW32= USE_DATA_GENERAL= +dnl the list of all available toolkits +ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" + dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones dnl which are either yes or no DEFAULT_wxUSE_GTK=0 @@ -176,8 +179,22 @@ case "${host}" in AC_DEFINE(__SVR4__) DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; + + *-*-cygwin32* ) + USE_UNIX=0 + AC_DEFINE(__WIN32__) + AC_DEFINE(__WIN95__) + AC_DEFINE(__WINDOWS__) + AC_DEFINE(__GNUWIN32__) + DEFAULT_DEFAULT_wxUSE_MSW=1 + ;; + + *-pc-os2_emx ) + AC_DEFINE(__EMX__) + ;; + *) - AC_MSG_ERROR(unknown system type $(host).) + AC_MSG_ERROR(unknown system type ${host}.) esac if test "$USE_UNIX" = 1 ; then @@ -193,16 +210,6 @@ if test "$USE_LINUX" = 1; then AC_CHECK_LIB(c,gettext,AC_DEFINE(wxHAVE_GLIBC2)) fi -dnl TODO cross-compiling for Windows not yet supported -AC_DEFINE(__UNIX__) - -dnl if eval "test $USE_CYGWIN != 1 -a $USE_MINGW32 != 1"; then -dnl AC_DEFINE(__UNIX__) -dnl else -dnl AC_DEFINE(__WINDOWS__) -dnl DEFAULT_wxUSE_MSW=1 -dnl fi - dnl --------------------------------------------------------------------------- dnl command line options for configure dnl --------------------------------------------------------------------------- @@ -223,6 +230,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes @@ -241,9 +250,11 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_TIMEDATE=no + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_STREAMS=no @@ -276,6 +287,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_COMMONDLGS=no + DEFAULT_wxUSE_DIRDLG=no + DEFAULT_wxUSE_TEXTDLG=no + DEFAULT_wxUSE_STARTUP_TIPS=no + DEFAULT_wxUSE_PROGRESSDLG=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_VALIDATORS=yes @@ -284,6 +299,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -313,6 +329,8 @@ else DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no @@ -331,9 +349,11 @@ else DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_STD_IOSTREAM=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_STREAMS=yes @@ -366,6 +386,10 @@ else DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_COMMONDLGS=yes + DEFAULT_wxUSE_DIRDLG=yes + DEFAULT_wxUSE_TEXTDLG=yes + DEFAULT_wxUSE_STARTUP_TIPS=yes + DEFAULT_wxUSE_PROGRESSDLG=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_VALIDATORS=yes @@ -374,6 +398,7 @@ else DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLST=yes + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes @@ -408,29 +433,27 @@ dnl ============================ dnl external package dependecies dnl ============================ -dnl TODO should support these options! -dnl -dnl AC_ARG_WITH(gtk-prefix, [ --with-gtk-prefix=PFX prefix where GTK is installed], -dnl gtk_config_prefix="$withval", gtk_config_prefix="") -dnl AC_ARG_WITH(gtk-exec-prefix, -dnl [ --with-gtk-exec-prefix=PFX exec prefix where GTK is installed], gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") - dnl these options use AC_ARG_WITH and not WX_ARG_WITH on purpose - we cache dnl these values manually -for toolkit in GTK MOTIF MSW; do +for toolkit in `echo $ALL_TOOLKITS`; do LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}` if test "x$LINE" != x ; then has_toolkit_in_cache=1 eval "DEFAULT_$LINE" - echo $LINE >> ${wx_arg_cache_file}.tmp + eval "CACHE_$toolkit=1" fi done -AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" TOOLKIT_GIVEN=1]) -AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" TOOLKIT_GIVEN=1]) -AC_ARG_WITH(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" TOOLKIT_GIVEN=1]) -AC_ARG_WITH(cygwin, [ --with-cygwin use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" TOOLKIT_GIVEN=1]) -AC_ARG_WITH(mingw, [ --with-mingw use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" TOOLKIT_GIVEN=1]) +AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [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(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1]) +AC_ARG_WITH(cygwin, [ --with-cygwin use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1]) +AC_ARG_WITH(mingw, [ --with-mingw use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1]) + +AC_ARG_WITH(gtk-prefix, [ --with-gtk-prefix=PFX Prefix where GTK is installed], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix, [ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC) WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB) @@ -449,7 +472,6 @@ dnl compile options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) -WX_ARG_ENABLE(optimize, [ --enable-optimize create optimized code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) if test "$wxUSE_DEBUG" = "yes"; then @@ -460,12 +482,14 @@ elif test "$wxUSE_DEBUG" = "no"; then DEFAULT_wxUSE_DEBUG_INFO=no fi -WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG) -WX_ARG_ENABLE(debug_info, [ --enable-debug_info create code with debugging information], wxUSE_DEBUG_INFO) -WX_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], wxUSE_DEBUG_GDB) -WX_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt use wxDebugContext], wxUSE_DEBUG_CONTEXT) -WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory tracing], wxUSE_MEM_TRACING) -WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE) +WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG) +WX_ARG_ENABLE(debug_info, [ --enable-debug_info create code with debugging information], wxUSE_DEBUG_INFO) +WX_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], wxUSE_DEBUG_GDB) +WX_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt use wxDebugContext], wxUSE_DEBUG_CONTEXT) +WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory tracing], wxUSE_MEM_TRACING) +WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE) +WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI) +WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exceptions information], wxUSE_NO_EXCEPTIONS) dnl --------------------------------------------------------------------------- dnl --disable-gui will build only non-GUI part of wxWindows @@ -480,22 +504,25 @@ dnl --------------------------------------------------------------------------- dnl (small) optional non GUI classes dnl --------------------------------------------------------------------------- -WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL) -WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG) -WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS) -WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) -WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) -WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE) -WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION) -WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) -WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) -WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG) -WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) -WX_ARG_ENABLE(file, [ --enable-file use wxFile classes], wxUSE_FILE) -WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile classes], wxUSE_TEXTFILE) -WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE) -WX_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS) -WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)], wxUSE_JOYSTICK) +WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL) +WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG) +WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS) +WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) +WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) +WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE) +WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) +WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION) +WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) +WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) +WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG) +WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) +WX_ARG_ENABLE(file, [ --enable-file use wxFile classes], wxUSE_FILE) +WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile classes], wxUSE_TEXTFILE) +WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE) +WX_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS) +WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) +WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)], wxUSE_JOYSTICK) +WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) dnl --------------------------------------------------------------------------- dnl "big" options (i.e. those which change a lot of things throughout the library) @@ -557,6 +584,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -585,6 +613,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -613,7 +642,8 @@ WX_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], wxUSE_ WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON) WX_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], wxUSE_CHECKBOX) WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST) -WX_ARG_ENABLE(combobox, [ --enable-combobox use wxChoice and wxComboBox classes], wxUSE_COMBOBOX) +WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE) +WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox classes], wxUSE_COMBOBOX) 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(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST) @@ -640,6 +670,10 @@ dnl misc GUI options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(commondlg, [ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS) +WX_ARG_ENABLE(dirdlg, [ --enable-dirdlg use wxDirDialog], wxUSE_DIRDLG) +WX_ARG_ENABLE(textdlg, [ --enable-textdlg use wxTextDialog], wxUSE_TEXTDLG) +WX_ARG_ENABLE(tipdlg, [ --enable-tipdlg use startup tips], wxUSE_STARTUP_TIPS) +WX_ARG_ENABLE(progressdlg, [ --enable-progressdlg use wxProgressDialog], wxUSE_PROGRESSDLG) 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) @@ -655,14 +689,14 @@ AC_MSG_CHECKING(for toolkit) if test "$TOOLKIT_GIVEN" = 1; then dnl convert "yes" to 1 and "no" to 0 - for toolkit in GTK MOTIF MSW WINE; do + 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/"`" done else dnl try to guess the most apropriate toolkit for this platform - for toolkit in GTK MOTIF MSW WINE; do + for toolkit in `echo $ALL_TOOLKITS`; do if test "$has_toolkit_in_cache" != 1; then var=DEFAULT_DEFAULT_wxUSE_$toolkit else @@ -672,9 +706,8 @@ else done fi -dnl NB: this supposes that the shell is able to handle arithmetic expansion and -dnl the ${VAR:-VALUE} construction. It does simplify our life though... -NUM_TOOLKITS="$((${wxUSE_GTK:-0}+${wxUSE_MOTIF:-0}+${wxUSE_WINE:-0}+${wxUSE_MSW:-0}))" +dnl we suppose that expr exists... +NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}` case "$NUM_TOOLKITS" in 1) @@ -687,11 +720,15 @@ case "$NUM_TOOLKITS" in esac dnl cache the wxUSE_ values too -for toolkit in GTK MOTIF MSW WINE; do +for toolkit in `echo $ALL_TOOLKITS`; do var=wxUSE_$toolkit eval "value=\$${var}" if test "x$value" != x; then - echo "$var=$value" >> ${wx_arg_cache_file} + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + fi if test "$value" = 1; then AC_MSG_RESULT(`echo $toolkit | tr [[A-Z]] [[a-z]]`) fi @@ -817,7 +854,11 @@ AM_PROG_LEX dnl needed for making link to setup.h AC_PROG_LN_S -dnl libtool checks (disable static libs by default, this takes too much time...) +dnl without this (which just means that we use WXDLLEXPORT) libtool won't build +dnl DLLs under Win32. +dnl AC_LIBTOOL_WIN32_DLL + +dnl disable static libs by default, this takes too much time... AM_DISABLE_STATIC AM_PROG_LIBTOOL @@ -877,6 +918,7 @@ SEARCH_INCLUDE="\ /usr/include/qt \ /usr/local/include/qt \ \ + /usr/include/windows \ /usr/include/wine \ /usr/local/include/wine \ \ @@ -903,8 +945,6 @@ dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- TOOLKIT= -TOOLKIT_DEF= -TOOLKIT_DIR= TOOLKIT_INCLUDE= GUI_TK_LIBRARY= @@ -914,6 +954,21 @@ WXGTK12= WXWINE= +if test "$wxUSE_CYGWIN" = 1; then + AC_MSG_CHECKING(for Windows headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) + + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found $ac_find_includes) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + fi + + TOOLKIT=MSW +fi + if test "$wxUSE_GTK" = 1; then dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and dnl only then, if it wasn't found, for an older one @@ -932,6 +987,7 @@ if test "$wxUSE_WINE" = 1; then WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) if test "$ac_find_includes" != "" ; then AC_MSG_RESULT(found $ac_find_includes) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" else AC_MSG_RESULT(no) AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) @@ -941,20 +997,31 @@ if test "$wxUSE_WINE" = 1; then AC_MSG_CHECKING(for Xpm library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " + GUI_TK_LIBRARY="-L$ac_find_libraries" + XPM_LINK="-lXpm" AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found at $ac_find_libraries) else AC_MSG_RESULT(no) AC_MSG_WARN(library will be compiled without support for images in XPM format) fi + + MESA_LINK="" + AC_MSG_CHECKING(for Mesa library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" + MESA_LINK="-lMesaGL" + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_MSG_ERROR(no) + fi - GUI_TK_LINK="-lwine $XPM_LINK -lXmu -lX11 -lm" + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -ldl -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW + LTLIBOBJS="$LTLIBOBJS winestub.lo" fi if test "$wxUSE_MOTIF" = 1; then @@ -1017,7 +1084,7 @@ if test "$wxUSE_MOTIF" = 1; then AC_MSG_WARN(library will be compiled without support for images in XPM format) fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -lm" + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF fi @@ -1151,9 +1218,11 @@ dnl flush the cache AC_CACHE_SAVE dnl --------------------------------------------------------------------------- -dnl thread support +dnl thread support for Unix (always available under Win32) dnl --------------------------------------------------------------------------- +if test "$USE_UNIX" = 1; then + dnl the code below: dnl defines THREADS_OBJ which contains the object files to build dnl defines THREADS_LINK which contains the thread library to link with @@ -1162,9 +1231,16 @@ dnl defines wxUSE_THREADS=1 if thread support is activated THREADS_LINK="" THREADS_OBJ="" -if test "$wxUSE_THREADS" = "yes"; then - dnl find if POSIX threads are available +if test "$wxUSE_THREADS" = "yes" ; then + if test "$wxUSE_WINE" = 1 ; then + AC_MSG_WARN([Threads are not supported under WINE]) + wxUSE_THREADS="no" + fi +fi +if test "$wxUSE_THREADS" = "yes" ; then + dnl find if POSIX threads are available + dnl standard lib name is pthread dnl We no longer test for pthread-0.7 as it breaks compilation on some dnl glibc2 systems, especially for static linkage. @@ -1183,25 +1259,16 @@ if test "$wxUSE_THREADS" = "yes"; then ]) ]) ]) - if test "$THREADS_LINK" != ""; then - AC_DEFINE(wxUSE_THREADS) - else - AC_MSG_WARN(No thread support on this system) - fi fi -if test -z "$THREADS_OBJ"; then - wxUSE_THREADS=no +if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no + AC_MSG_WARN(No thread support on this system) fi dnl do other tests only if we are using threads -if test "$wxUSE_THREADS" = "yes"; then - dnl must define _REENTRANT for multithreaded code - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" -dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ" +if test "$wxUSE_THREADS" = "yes" ; then + dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ" dnl define autoconf macro to check for given function in both pthread and dnl posix4 libraries @@ -1264,6 +1331,19 @@ dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ" THREADS_LINK="-l$THREADS_LINK" fi +dnl from if USE_UNIX +fi + +if test "$wxUSE_THREADS" = "yes"; then + AC_DEFINE(wxUSE_THREADS) + + dnl must define _REENTRANT for multithreaded code + CFLAGS="${CFLAGS} -D_REENTRANT" + CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" +fi + if test "$WXGTK12" = 1 ; then AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12) fi @@ -1272,6 +1352,10 @@ if test "$WXWINE" = 1 ; then TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__" fi +if test "$wxUSE_CYGWIN" = 1 ; then + TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" +fi + WXDEBUG= if test "$wxUSE_DEBUG_GDB" = "yes" ; then wxUSE_DEBUG_INFO=yes @@ -1284,42 +1368,54 @@ if test "$wxUSE_DEBUG_INFO" = "yes" ; then fi if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - AC_DEFINE(WXDEBUG) - WXDEBUG_DEFINE="-D__WXDEBUG__" + AC_DEFINE(WXDEBUG) + WXDEBUG_DEFINE="-D__WXDEBUG__" else - WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + if test "$wxUSE_GTK" = 1 ; then + WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + fi fi if test "$wxUSE_MEM_TRACING" = "yes" ; then - AC_DEFINE(wxUSE_MEMORY_TRACING) - AC_DEFINE(wxUSE_GLOBAL_MEMORY_OPERATORS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" + AC_DEFINE(wxUSE_MEMORY_TRACING) + AC_DEFINE(wxUSE_GLOBAL_MEMORY_OPERATORS) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" fi if test "$wxUSE_DMALLOC" = "yes" ; then - DMALLOC_LINK="-ldmalloc" + DMALLOC_LINK="-ldmalloc" fi PROFILE= if test "$wxUSE_PROFILE" = "yes" ; then - PROFILE="-pg" + PROFILE="-pg" fi +if test "$GCC" = yes ; then + if test "$wxUSE_NO_RTTI" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" + fi + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" + fi +fi + + CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= + OPTIMISE= else - if test "$GCC" = yes ; then - OPTIMISE="-O2" - case "${host}" in - i586-*-*|i686-*-* ) - OPTIMISE="${OPTIMISE} " - ;; - esac - else - OPTIMISE="-O" - fi + if test "$GCC" = yes ; then + OPTIMISE="-O2" + case "${host}" in + i586-*-*|i686-*-* ) + OPTIMISE="${OPTIMISE} " + ;; + esac + else + OPTIMISE="-O" + fi fi dnl --------------------------------------------------------------------------- @@ -1435,10 +1531,18 @@ if test "$wxUSE_TIMEDATE" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi +if test "$wxUSE_WAVE" = "yes"; then + AC_DEFINE(wxUSE_WAVE) +fi + if test "$wxUSE_FILE" = "yes"; then AC_DEFINE(wxUSE_FILE) fi +if test "$wxUSE_STD_IOSTREAM" = "yes"; then + AC_DEFINE(wxUSE_STD_IOSTREAM) +fi + if test "$wxUSE_TEXTFILE" = "yes"; then if test "$wxUSE_FILE" != "yes"; then AC_MSG_WARN(wxTextFile requires wxFile and it won't be compiled without it) @@ -1479,7 +1583,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" else - AC_MSG_WARN(socket classes require --with-threads and won't be compiled without it) + AC_MSG_WARN(Socket classes require --with-threads and won't be compiled without it) wxUSE_SOCKETS=0 fi fi @@ -1561,7 +1665,7 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then fi dnl --------------------------------------------------------------------------- -dnl Unicode +dnl String stuff dnl --------------------------------------------------------------------------- if test "$wxUSE_UNICODE" = "yes" ; then @@ -1572,6 +1676,10 @@ if test "$wxUSE_WCSRTOMBS" = "yes" ; then AC_DEFINE(wxUSE_WCSRTOMBS) fi +if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then + AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF) +fi + dnl ---------------------------------------------------------------- dnl iODBC support dnl ---------------------------------------------------------------- @@ -1601,72 +1709,83 @@ dnl big GUI components: MDI, doc/view, printing, help, ... dnl --------------------------------------------------------------------------- if test "$wxUSE_CONSTRAINTS" = "yes"; then - AC_DEFINE(wxUSE_CONSTRAINTS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" + AC_DEFINE(wxUSE_CONSTRAINTS) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" fi if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - AC_DEFINE(wxUSE_MDI_ARCHITECTURE) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + AC_DEFINE(wxUSE_MDI_ARCHITECTURE) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then - AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" - fi + AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" + if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" + fi fi if test "$wxUSE_HELP" = "yes"; then - AC_DEFINE(wxUSE_HELP) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + AC_DEFINE(wxUSE_HELP) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then - AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" + if test "$wxUSE_CONSTRAINTS" != "yes"; then + AC_MSG_WARN(Printing support cannot be used without constraints so it won't be compiled without it) + else + AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE) + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi if test "$wxUSE_PROLOGIO" = "yes" ; then - AC_DEFINE(wxUSE_PROLOGIO) + AC_DEFINE(wxUSE_PROLOGIO) fi if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_PROLOGIO" = "yes" ; then - AC_DEFINE(wxUSE_RESOURCES) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" - else - AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.]) - fi + if test "$wxUSE_PROLOGIO" = "yes" ; then + AC_DEFINE(wxUSE_RESOURCES) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" + else + AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.]) + fi fi if test "$wxUSE_X_RESOURCES" = "yes"; then - AC_DEFINE(wxUSE_X_RESOURCES) + AC_DEFINE(wxUSE_X_RESOURCES) fi dnl --------------------------------------------------------------------------- -dnl IPC: IPC, d-n-d, clipboard, ... +dnl IPC: IPC, Drag'n'Drop, Clipboard, ... dnl --------------------------------------------------------------------------- if test "$wxUSE_IPC" = "yes"; then - AC_DEFINE(wxUSE_IPC) + AC_DEFINE(wxUSE_IPC) fi if test "$wxUSE_CLIPBOARD" = "yes"; then - AC_DEFINE(wxUSE_CLIPBOARD) + AC_DEFINE(wxUSE_CLIPBOARD) fi -if test "$wxUSE_DRAG_AND_DROP" = "yes"; then - if test "$WXGTK12" = 1 ; then - AC_DEFINE(wxUSE_DRAG_AND_DROP) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" - else - AC_MSG_WARN(drag and drop is only supported under GTK 1.2) - fi - if test "$WXWINE" = 1 ; then - AC_MSG_WARN(drag and drop is only supported under WINE) - fi +if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then + if test "$wxUSE_GTK" = 1; then + if test "$WXGTK12" != 1; then + AC_MSG_WARN([Drag and drop is only supported under wxGTK 2.1]) + wxUSE_DRAG_AND_DROP=no + fi + fi + + if test "$wxUSE_MOTIF" = 1; then + AC_MSG_WARN([Drag and drop is not yet supported under Motif]) + wxUSE_DRAG_AND_DROP=no + fi + + if test "$wxUSE_DRAG_AND_DROP" = "yes"; then + AC_DEFINE(wxUSE_DRAG_AND_DROP) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" + fi fi if test "$wxUSE_SPLINES" = "yes" ; then @@ -1690,6 +1809,10 @@ if test "$wxUSE_COMBOBOX" = "yes"; then AC_DEFINE(wxUSE_COMBOBOX) fi +if test "$wxUSE_CHOICE" = "yes"; then + AC_DEFINE(wxUSE_CHOICE) +fi + if test "$wxUSE_BMPBUTTON" = "yes"; then AC_DEFINE(wxUSE_BMPBUTTON) fi @@ -1713,99 +1836,111 @@ if test "$wxUSE_GRID" = "yes"; then fi if test "$wxUSE_IMAGLIST" = "yes"; then - AC_DEFINE(wxUSE_IMAGLIST) + AC_DEFINE(wxUSE_IMAGLIST) fi if test "$wxUSE_LISTBOX" = "yes"; then - AC_DEFINE(wxUSE_LISTBOX) + AC_DEFINE(wxUSE_LISTBOX) fi if test "$wxUSE_LISTCTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - AC_DEFINE(wxUSE_LISTCTRL) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" - else - AC_MSG_WARN([wxListCtrl requires wxImageList and won't be compiled without it]) - fi + if test "$wxUSE_IMAGLIST" = "yes"; then + AC_DEFINE(wxUSE_LISTCTRL) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" + else + AC_MSG_WARN([wxListCtrl requires wxImageList and won't be compiled without it]) + fi fi if test "$wxUSE_NOTEBOOK" = "yes"; then - AC_DEFINE(wxUSE_NOTEBOOK) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" + AC_DEFINE(wxUSE_NOTEBOOK) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi if test "$wxUSE_RADIOBOX" = "yes"; then - AC_DEFINE(wxUSE_RADIOBOX) + AC_DEFINE(wxUSE_RADIOBOX) fi if test "$wxUSE_RADIOBTN" = "yes"; then - AC_DEFINE(wxUSE_RADIOBTN) + AC_DEFINE(wxUSE_RADIOBTN) fi if test "$wxUSE_SASH" = "yes"; then - AC_DEFINE(wxUSE_SASH) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" + AC_DEFINE(wxUSE_SASH) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" fi if test "$wxUSE_SCROLLBAR" = "yes"; then - AC_DEFINE(wxUSE_SCROLLBAR) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" + AC_DEFINE(wxUSE_SCROLLBAR) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" fi if test "$wxUSE_SLIDER" = "yes"; then - AC_DEFINE(wxUSE_SLIDER) + AC_DEFINE(wxUSE_SLIDER) fi if test "$wxUSE_SPINBTN" = "yes"; then - AC_DEFINE(wxUSE_SPINBTN) + AC_DEFINE(wxUSE_SPINBTN) fi if test "$wxUSE_SPLITTER" = "yes"; then - AC_DEFINE(wxUSE_SPLITTER) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" + AC_DEFINE(wxUSE_SPLITTER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" fi if test "$wxUSE_STATBMP" = "yes"; then - AC_DEFINE(wxUSE_STATBMP) + AC_DEFINE(wxUSE_STATBMP) fi if test "$wxUSE_STATBOX" = "yes"; then - AC_DEFINE(wxUSE_STATBOX) + AC_DEFINE(wxUSE_STATBOX) fi if test "$wxUSE_STATLINE" = "yes"; then - AC_DEFINE(wxUSE_STATLINE) + if test "$wxUSE_WINE" = 1 ; then + AC_MSG_WARN([wxStaticLine is not supported under WINE]) + else + if test "$wxUSE_MOTIF" = 1 ; then + AC_MSG_WARN([wxStaticLine is not supported under Motif]) + else + AC_DEFINE(wxUSE_STATLINE) + fi + fi fi if test "$wxUSE_STATUSBAR" = "yes"; then - AC_DEFINE(wxUSE_STATUSBAR) + AC_DEFINE(wxUSE_STATUSBAR) fi if test "$wxUSE_TABDIALOG" = "yes"; then - AC_DEFINE(wxUSE_TAB_DIALOG) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" + AC_DEFINE(wxUSE_TAB_DIALOG) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi if test "$wxUSE_TOOLBAR" = "yes"; then - AC_DEFINE(wxUSE_TOOLBAR) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" + AC_DEFINE(wxUSE_TOOLBAR) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" fi -if test "$wxUSE_TOOLTIPS" = "yes" ; then - if test "$wxUSE_MOTIF" = "yes"; then - AC_MSG_WARN(tooltips are not supported yet under Motif) +if test "$wxUSE_TOOLTIPS" = "yes"; then + if test "$wxUSE_MOTIF" = 1; then + AC_MSG_WARN(wxTooltip not supported yet under Motif) else - AC_DEFINE(wxUSE_TOOLTIPS) + if test "$wxUSE_WINE" = 1; then + AC_MSG_WARN(wxTooltip not supported under WINE) + else + AC_DEFINE(wxUSE_TOOLTIPS) + fi fi fi if test "$wxUSE_TREECTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - AC_DEFINE(wxUSE_TREECTRL) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" - else - AC_MSG_WARN([wxTreeCtrl requires wxImageList and won't be compiled without it]) - fi + if test "$wxUSE_IMAGLIST" = "yes"; then + AC_DEFINE(wxUSE_TREECTRL) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" + else + AC_MSG_WARN([wxTreeCtrl requires wxImageList and won't be compiled without it]) + fi fi dnl --------------------------------------------------------------------------- @@ -1818,38 +1953,49 @@ dnl AC_DEFINE(wxUSE_WXTREE) dnl fi if test "$wxUSE_METAFILE" = "yes"; then - AC_DEFINE(wxUSE_METAFILE) + AC_DEFINE(wxUSE_METAFILE) fi -if test "$wxUSE_COMMONDLGS" = "yes"; then - dnl these classes don't depend on anything at all +if test "$wxUSE_DIRDLG" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + AC_MSG_WARN(wxDirDialog requires constraints so it won't be compiled without them) + else + if test "$wxUSE_TREECTRL" != "yes"; then + AC_MSG_WARN(wxDirDialog requires wxTreeCtrl so it won't be compiled without it) + else + AC_DEFINE(wxUSE_DIRDLG) + fi + fi +fi - if test "$wxUSE_CONSTRAINTS" != "yes"; then - AC_MSG_WARN(many common dialogs cannot be used without constraints so they won't be compiled without them) - else - AC_DEFINE(wxUSE_CONSTRAINTS) +if test "$wxUSE_TEXTDLG" = "yes"; then AC_DEFINE(wxUSE_TEXTDLG) +fi - if test "$wxUSE_TREECTRL" != "yes"; then - AC_MSG_WARN(wxDirDialog cannot be used without wxTreeCtrl and it won't be compiled without it) +if test "$wxUSE_STARTUP_TIPS" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + AC_MSG_WARN(Startup tips requires constraints and won't be compiled without them) else - AC_DEFINE(wxUSE_DIRDLG) + AC_DEFINE(wxUSE_STARTUP_TIPS) fi - fi +fi - if test "$wxUSE_PRINTING_ARCHITECTURE" = "no"; then - AC_MSG_WARN([wxPrintDialog class won't be compiled without printing support]) - fi +if test "$wxUSE_PROGRESSDLG" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + AC_MSG_WARN(wxProgressDialog requires constraints so it won't be compiled without them) + else + AC_DEFINE(wxUSE_PROGRESSDLG) + fi fi if test "$wxUSE_MINIFRAME" = "yes"; then - AC_DEFINE(wxUSE_MINIFRAME) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" + AC_DEFINE(wxUSE_MINIFRAME) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi if test "$wxUSE_VALIDATORS" = "yes"; then - AC_DEFINE(wxUSE_VALIDATORS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" + AC_DEFINE(wxUSE_VALIDATORS) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi dnl --------------------------------------------------------------------------- @@ -1871,26 +2017,27 @@ dnl all -I options we must pass to the compiler INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE" dnl C/C++ compiler options used to compile wxWindows -if test "$ac_cv_prog_gcc" = "yes"; then - dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" - CXXWARNINGS="-Wall" - dnl there is one weird warning in docview.h:71 which prevents me from doing - dnl this... - dnl CXXWARNINGS="-Wall -Werror" +if test "$GXX" = yes ; then + dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" + CXXWARNINGS="-Wall" + dnl there is one weird warning in docview.h:71 which prevents me from doing + dnl this... + dnl CXXWARNINGS="-Wall -Werror" fi EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES" +CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS" CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS" if test "$wxUSE_GUI" = "yes"; then - dnl TODO add checks that these samples will really compile (i.e. all the - dnl library features they need are present) + 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 mfc, nativdlg, oleauto, ownerdrw, proplist - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ - forty fractal image notepad wxpoem" + dnl TODO some samples are never built so far: + dnl mfc, nativdlg, oleauto, ownerdrw, proplist + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ + forty fractal image richedit wxpoem" fi dnl for convenience, sort the files to build in alphabetical order @@ -1960,6 +2107,13 @@ AC_OUTPUT([ wx-config Makefile src/Makefile + +dnl just for testing, will remove soon (VZ) +dnl src/msw/Makefile +dnl include/Makefile include/wx/Makefile include/wx/generic/Makefile +dnl include/wx/msw/Makefile +dnl samples/Makefile samples/minimal/Makefile + src/gtk/Makefile src/motif/Makefile src/msw/Makefile @@ -2027,7 +2181,11 @@ AC_OUTPUT([ ], [ chmod +x wx-config - if test ! -e include/wx/${TOOLKIT_DIR}/setup.h; then +dnl The following line is more elegant but test -e is not supported by all +dnl test varieties. +dnl if test ! -e include/wx/${TOOLKIT_DIR}/setup.h; then + cat include/wx/${TOOLKIT_DIR}/setup.h >/dev/null 2>&1 + if test $? != 0; then ${LN_S} `pwd`/setup.h include/wx/${TOOLKIT_DIR}/setup.h fi ],