X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afc31813f606e94d4566fe5860531e03e44388b2..84f19880c64afe685995f439be8956f1effdba82:/configure.in diff --git a/configure.in b/configure.in index 5e735b4692..9a9b0e2c88 100644 --- a/configure.in +++ b/configure.in @@ -49,6 +49,7 @@ dnl checks the results of gtk-config to some extent) dnl AC_TRY_RUN([ #include +#include #include int @@ -61,6 +62,13 @@ main () exit(1); } + if ((GTK_MAJOR_VERSION != gtk_major_version) || + (GTK_MINOR_VERSION != gtk_minor_version) || + (GTK_MICRO_VERSION != gtk_micro_version)) { + printf("Headers vs. library version mismatch!\n"); + exit(1); + } + if (gtk_minor_version == 1) return FALSE; return !((gtk_major_version > major) || @@ -401,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0 WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 -WX_RELEASE_NUMBER=10 +WX_RELEASE_NUMBER=12 WX_INTERFACE_AGE=0 WX_BINARY_AGE=0 @@ -440,6 +448,11 @@ USE_CYGWIN= USE_MINGW= USE_DATA_GENERAL= +dnl on some platforms xxx_r() functions are declared inside "#ifdef +dnl _REENTRANT" and it's easier to just define this symbol for these platforms +dnl than checking it during run-time +NEEDS_D_REENTRANT_FOR_R_FUNCS=0 + dnl the list of all available toolkits ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" @@ -462,6 +475,7 @@ case "${host}" in *-hp-hpux* ) USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 + NEEDS_D_REENTRANT_FOR_R_FUNCS=1 AC_DEFINE(__HPUX__) ;; *-*-linux* ) @@ -489,6 +503,7 @@ case "${host}" in AC_DEFINE(__SOLARIS__) AC_DEFINE(__SVR4__) DEFAULT_DEFAULT_wxUSE_MOTIF=1 + NEEDS_D_REENTRANT_FOR_R_FUNCS=1 ;; *-*-sunos4* ) USE_SUN=1 @@ -537,18 +552,7 @@ case "${host}" in DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; - *-*-cygwin32* ) - USE_UNIX=0 - USE_WIN32=1 - AC_DEFINE(__WIN32__) - AC_DEFINE(__WIN95__) - AC_DEFINE(__WINDOWS__) - AC_DEFINE(__GNUWIN32__) - AC_DEFINE(STRICT) - AC_DEFINE(WINVER, 0x0400) - DEFAULT_DEFAULT_wxUSE_MSW=1 - ;; - *-*-mingw32* ) + *-*-cygwin32* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 AC_DEFINE(__WIN32__) @@ -620,6 +624,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no + DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_STD_IOSTREAM=no @@ -692,6 +697,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no @@ -732,6 +738,7 @@ else DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes + DEFAULT_wxUSE_LIBTIFF=yes DEFAULT_wxUSE_ODBC=yes DEFAULT_wxUSE_STD_IOSTREAM=no @@ -793,7 +800,7 @@ else DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -804,6 +811,7 @@ else DEFAULT_wxUSE_SCROLLBAR=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes DEFAULT_wxUSE_SPLITTER=yes DEFAULT_wxUSE_STATBMP=yes DEFAULT_wxUSE_STATBOX=yes @@ -855,6 +863,7 @@ if test "$wxUSE_GUI" = "no"; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no + DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_SOCKETS=no DEFAULT_wxUSE_JOYSTICK=no DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no @@ -907,6 +916,7 @@ if test "$wxUSE_GUI" = "no"; then DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no @@ -935,6 +945,7 @@ WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.l WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB) WX_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) WX_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG) +WX_ARG_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF) WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) @@ -1060,7 +1071,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -1071,6 +1082,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_SCROLLBAR=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes DEFAULT_wxUSE_SPLITTER=yes DEFAULT_wxUSE_STATBMP=yes DEFAULT_wxUSE_STATBOX=yes @@ -1101,6 +1113,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no @@ -1132,6 +1145,7 @@ WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], w WX_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR) WX_ARG_ENABLE(slider, [ --enable-slider use wxSlider class], wxUSE_SLIDER) WX_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class], wxUSE_SPINBTN) +WX_ARG_ENABLE(spinctrl, [ --enable-spinctrl use wxSpinCtrl class], wxUSE_SPINCTRL) WX_ARG_ENABLE(splitter, [ --enable-splitter use wxSplitterWindow class], wxUSE_SPLITTER) WX_ARG_ENABLE(statbmp, [ --enable-statbmp use wxStaticBitmap class], wxUSE_STATBMP) WX_ARG_ENABLE(statbox, [ --enable-statbox use wxStaticBox class], wxUSE_STATBOX) @@ -1354,7 +1368,8 @@ dnl --------------------------------------------------------------------------- dnl notice that /usr/include should not be in this list, otherwise it breaks dnl compilation on Solaris/gcc because standard headers are included instead -dnl of the gcc ones +dnl of the gcc ones (correction: it *is* needed for broken AIX compiler - but +dnl do put it last!) dnl dnl Also try to put all directories which may contain X11R6 before those which dnl may contain X11R5/4 - we want to use R6 on machines which have both! @@ -1419,7 +1434,8 @@ SEARCH_INCLUDE="\ /usr/lpp/Xamples/include \ \ /usr/openwin/share/include \ -" + \ + /usr/include" SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " @@ -1506,7 +1522,12 @@ if test "$wxUSE_GTK" = 1; then COMMONDEPS="\$(GTK_COMMONDEPS)" GENERICDEPS="\$(GTK_GENERICDEPS)" UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=GTK_DIST + +dnl test for XIM support in libgdk +AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) + fi if test "$wxUSE_WINE" = 1; then @@ -1557,33 +1578,47 @@ if test "$wxUSE_WINE" = 1; then COMMONDEPS="\$(MSW_COMMONDEPS)" GENERICDEPS="\$(MSW_GENERICDEPS)" UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=MSW_DIST fi if test "$wxUSE_MOTIF" = 1; then - AC_MSG_CHECKING(for X11 headers) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h) - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h) - fi + dnl use standard macros to check for X headers/libs, this brings support + dnl for the standard configure options --x-includes and --x-libraries + AC_PATH_XTRA - AC_MSG_CHECKING(for X11 libraries) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11) - if test "$ac_find_libraries" != "" ; then - WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) - WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm) + if test "$no_x" = "yes"; then + AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) fi + GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" + + dnl manual check for X11 headers/libs + dnl + dnl AC_MSG_CHECKING(for X11 headers) + dnl WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h) + dnl if test "$ac_find_includes" != "" ; then + dnl AC_MSG_RESULT(found $ac_find_includes) + dnl else + dnl AC_MSG_RESULT(no) + dnl AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h) + dnl fi + dnl + dnl AC_MSG_CHECKING(for X11 libraries) + dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) + dnl WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) + dnl + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + dnl TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + dnl AC_MSG_RESULT(found at $ac_find_libraries) + dnl else + dnl AC_MSG_RESULT(no) + dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11) + dnl fi + AC_MSG_CHECKING(for Motif/Lesstif headers) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) if test "$ac_find_includes" != "" ; then @@ -1644,6 +1679,7 @@ if test "$wxUSE_MOTIF" = 1; then COMMONDEPS="\$(MOTIF_COMMONDEPS)" GENERICDEPS="\$(MOTIF_GENERICDEPS)" UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=MOTIF_DIST fi @@ -1657,7 +1693,19 @@ dnl the name of the (libtool) library WX_LIBRARY="wx_${TOOLKIT_DIR}" dnl the sources, their dependenices and the headers - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)" + ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" + if test "$wxUSE_LIBJPEG" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" + fi + if test "$wxUSE_LIBTIFF" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" + fi + if test "$wxUSE_LIBPNG" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" + fi + if test "$wxUSE_ZLIB" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" + fi ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" else @@ -1691,12 +1739,13 @@ SHARED_LD= PIC_FLAG= WX_ALL= WX_ALL_INSTALLED= +BURNT_LIBRARY_NAME= if test "$wxUSE_SHARED" = "yes"; then case "${host}" in *-hp-hpux* ) if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" + SHARED_LD="${CC} -shared -fPIC -o" PIC_FLAG="-fPIC" else SHARED_LD="${CXX} -b -o" @@ -1710,6 +1759,7 @@ if test "$wxUSE_SHARED" = "yes"; then PIC_FLAG="-fPIC" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" WX_ALL="CREATE_LINKS" + dnl BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}" ;; *-*-irix5* | *-*-irix6* ) if test "$GCC" = yes ; then @@ -1931,6 +1981,9 @@ if test "$USE_UNIX" = 1; then dnl check for vfork() (even if it's the same as fork() in modern Unices) AC_CHECK_FUNCS(vfork) +dnl check for timegm() used by datetime.cpp +AC_CHECK_FUNCS(timegm) + POSIX4_LINK= AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [ AC_CHECK_LIB(posix4, nanosleep, [ @@ -1956,7 +2009,7 @@ AC_CHECK_FUNCS(inet_addr, AC_DEFINE(HAVE_INET_ADDR), [ AC_CHECK_LIB(nsl, inet_addr, - INET_LINK="nsl", + INET_LINK="nsl", AC_CHECK_LIB(resolv, inet_addr, INET_LINK="resolv" ) @@ -2037,6 +2090,8 @@ fi dnl do other tests only if we are using threads if test "$wxUSE_THREADS" = "yes" ; then + AC_CHECK_FUNCS(thr_setconcurrency) + dnl define autoconf macro to check for given function in both pthread and dnl posix4 libraries dnl usage: AC_FUNC_THREAD(FUNCTION_NAME) @@ -2113,17 +2168,13 @@ else dnl on some systems, _REENTRANT should bedefined if we want to use any _r() dnl functions - add tests for other functions here as well if test "$ac_cv_func_strtok_r" = "yes"; then - dnl and now try with C++ - unset ac_cv_func_strtok_r - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CHECK_FUNCS(strtok_r) - AC_LANG_RESTORE - - if test "$ac_cv_func_strtok_r" != "yes"; then - ac_cv_func_strtok_r=yes - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + AC_MSG_CHECKING(if -D_REENTRANT is needed) + if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then + CFLAGS="${CFLAGS} -D_REENTRANT" + CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) fi fi fi @@ -2234,6 +2285,12 @@ if test "$wxUSE_LIBJPEG" = "yes" ; then JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" fi +TIFF_INCLUDE= +if test "$wxUSE_LIBTIFF" = "yes" ; then + AC_DEFINE(wxUSE_LIBTIFF) + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" +fi + if test "$wxUSE_OPENGL" = "yes"; then AC_CHECK_HEADER(GL/gl.h, [ AC_CHECK_LIB(GL, glInitNames, [ @@ -2352,6 +2409,7 @@ fi if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then AC_DEFINE(wxUSE_DIALUP_MANAGER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" fi if test "$wxUSE_STREAMS" = "yes" ; then @@ -2367,9 +2425,30 @@ dnl time/date functions dnl ------------------------------------------------------------------------ if test "$wxUSE_TIMEDATE" = "yes"; then - AC_CHECK_FUNCS(gettimeofday localtime ftime) + dnl check for localtime (POSIX), gettimeofday (SVr4, BSD 4.3) and ftime + dnl (V7, BSD 4.3) + AC_CHECK_FUNCS(localtime gettimeofday ftime, break) - if test "$ac_cv_func_gettimeofday" = "yes"; then + if test "$ac_cv_func_localtime" = "yes"; then + AC_CACHE_CHECK(for tm_gmtoff in struct tm, + wx_cv_struct_tm_has_gmtoff, + [ + AC_TRY_COMPILE( + [ + #include + ], + [ + struct tm tm; + tm.tm_gmtoff++; + ], + [ + wx_cv_struct_tm_has_gmtoff=yes + AC_DEFINE(WX_GMTOFF_IN_TM) + ], + wx_cv_struct_tm_has_gmtoff=no + ) + ]) + elif test "$ac_cv_func_gettimeofday" = "yes"; then AC_CACHE_CHECK([whether gettimeofday takes two arguments], wx_cv_func_gettimeofday_has_2_args, [ @@ -2745,7 +2824,7 @@ fi if test "$wxUSE_SCROLLBAR" = "yes"; then AC_DEFINE(wxUSE_SCROLLBAR) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" fi if test "$wxUSE_SLIDER" = "yes"; then @@ -2756,6 +2835,10 @@ if test "$wxUSE_SPINBTN" = "yes"; then AC_DEFINE(wxUSE_SPINBTN) fi +if test "$wxUSE_SPINCTRL" = "yes"; then + AC_DEFINE(wxUSE_SPINCTRL) +fi + if test "$wxUSE_SPLITTER" = "yes"; then AC_DEFINE(wxUSE_SPLITTER) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" @@ -2885,6 +2968,14 @@ if test "$wxUSE_PNM" = "yes" ; then AC_DEFINE(wxUSE_PNM) fi +dnl --------------------------------------------------------------------------- +dnl get the string with OS info - used by wxGetOsDescription() +dnl --------------------------------------------------------------------------- + +OSINFO=`uname -s -r -m` +OSINFO="\"$OSINFO\"" +AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO) + dnl --------------------------------------------------------------------------- dnl Output the makefiles and such from the results found above dnl --------------------------------------------------------------------------- @@ -2902,7 +2993,7 @@ dnl makefile system without libtool LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" 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" +INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE" dnl C/C++ compiler options used to compile wxWindows if test "$GXX" = yes ; then @@ -2917,6 +3008,8 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES" CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'` CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` +LDFLAGS="$LDFLAGS $PROFILE" + 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) @@ -2924,7 +3017,7 @@ if test "$wxUSE_GUI" = "yes"; then 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 wxpoem" + font forty fractal image minimal richedit wxpoem" else SAMPLES_SUBDIRS="" fi @@ -2956,6 +3049,7 @@ AC_SUBST(WX_ALL_INSTALLED) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) AC_SUBST(DEP_INFO_FLAGS) +AC_SUBST(BURNT_LIBRARY_NAME) dnl debugging options AC_SUBST(WXDEBUG_DEFINE) @@ -2990,7 +3084,8 @@ AC_SUBST(DOCS_SUBDIRS) AC_SUBST(SAMPLES_SUBDIRS) AC_SUBST(USER_SUBDIRS) -dnl additional libraries +dnl additional libraries and linker settings +AC_SUBST(LDFLAGS) AC_SUBST(EXTRA_LIBS) AC_SUBST(LIBS) AC_SUBST(LD_LIBS) @@ -3027,6 +3122,7 @@ AC_OUTPUT([ samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile + samples/console/Makefile samples/db/Makefile samples/dialogs/Makefile samples/docview/Makefile @@ -3034,6 +3130,7 @@ AC_OUTPUT([ samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile @@ -3067,6 +3164,7 @@ AC_OUTPUT([ samples/html/about/Makefile samples/html/help/Makefile samples/html/printing/Makefile + samples/html/helpview/Makefile samples/html/test/Makefile samples/html/zip/Makefile samples/html/virtual/Makefile