X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef33c57631da6a37e7633621a2fcc9baf2710d54..3ba18664fc65e3494695bbd57250bcee36625c91:/configure.in diff --git a/configure.in b/configure.in index 40c4e861af..2cc624f0f9 100644 --- a/configure.in +++ b/configure.in @@ -379,7 +379,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no DEFAULT_wxUSE_POSTSCRIPT=no - DEFAULT_wxUSE_X_RESOURCES=no DEFAULT_wxUSE_CLIPBOARD=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAG_AND_DROP=no @@ -482,6 +481,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_IFF=no DEFAULT_wxUSE_XPM=no DEFAULT_wxUSE_ICO_CUR=no + DEFAULT_wxUSE_ACCESSIBILITY=no else DEFAULT_wxUSE_UNIVERSAL=no @@ -551,7 +551,6 @@ else DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes DEFAULT_wxUSE_POSTSCRIPT=yes - DEFAULT_wxUSE_X_RESOURCES=no DEFAULT_wxUSE_CLIPBOARD=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_DRAG_AND_DROP=yes @@ -654,6 +653,7 @@ else DEFAULT_wxUSE_PNM=yes DEFAULT_wxUSE_XPM=yes DEFAULT_wxUSE_ICO_CUR=yes + DEFAULT_wxUSE_ACCESSIBILITY=no fi dnl WX_ARG_WITH should be used to select whether an external package will be @@ -713,7 +713,7 @@ dnl for GUI only WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC) WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx class], wxUSE_REGEX) WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB) -WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) +WX_ARG_SYS_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) dnl --------------------------------------------------------------------------- dnl compile options @@ -852,10 +852,8 @@ dnl --------------------------------------------------------------------------- dnl resources dnl --------------------------------------------------------------------------- -dnl WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO) -WX_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources], wxUSE_RESOURCES) - -WX_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)], wxUSE_X_RESOURCES) +WX_ARG_ENABLE(prologio, [ --enable-prologio not available; see contrib], wxUSE_PROLOGIO) +WX_ARG_ENABLE(resources, [ --enable-resources not available; see contrib], wxUSE_RESOURCES) dnl --------------------------------------------------------------------------- dnl IPC &c @@ -1053,6 +1051,7 @@ WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUS 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(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE) +WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY) dnl --------------------------------------------------------------------------- dnl support for image formats that do not rely on external library @@ -2066,6 +2065,10 @@ if test "$USE_WIN32" = 1 ; then dnl --- some of them should probably be included conditionally. LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + if test "$wxUSE_ACCESSIBILITY" = "yes" ; then + LIBS="$LIBS -loleacc" + fi + case "${host}" in *-*-cygwin* ) dnl Cygwin doesn't include these by default @@ -2074,9 +2077,14 @@ if test "$USE_WIN32" = 1 ; then esac dnl add extra odbc libs if we have compiled in odbc + if test "$wxUSE_ODBC" = "sys" ; then + wxUSE_ODBC = "yes" + fi if test "$wxUSE_ODBC" = "yes" ; then LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" + AC_DEFINE(wxUSE_ODBC) fi + dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw. RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" @@ -2650,9 +2658,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_PM" = 1; then TOOLKIT=PM GUIDIST=GTK_DIST -dnl AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled]) -dnl wxUSE_PROLOGIO="yes" -dnl wxUSE_RESOURCES="yes" AC_MSG_WARN([OS/2 threads are not yet supported... disabled]) wxUSE_THREADS="no" fi @@ -2747,9 +2752,42 @@ dnl --------------------------------------------------------------------------- dnl Optional libraries included when system library is not used dnl --------------------------------------------------------------------------- -dnl ODBC objects are Unix only -if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" + +dnl ---------------------------------------------------------------- +dnl iODBC support +dnl ---------------------------------------------------------------- + +IODBC_C_SRC="" + + +dnl ODBC is handled seperately for MSW +if test "$TOOLKIT" != "MSW" ; then + + if test "$wxUSE_ODBC" != "no" ; then + AC_DEFINE(wxUSE_ODBC) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + + dnl is this still necessary in 2.5? + WXODBCFLAG="-D_IODBC_" + + + if test "$wxUSE_ODBC" = "sys" ; then + dnl This is not ideal we really ough to use the unixodbc-config + dnl or iodbc-config if they exist. + + AC_CHECK_HEADER(sql.h) + AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ + wxUSE_ODBC=builtin; + AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ]) + ] ) + fi + dnl Not "no" either... + if test "$wxUSE_ODBC" != "sys" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" + fi + + fi + fi if test "$wxUSE_REGEX" = "builtin" ; then @@ -4650,18 +4688,6 @@ if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF) fi - -dnl ---------------------------------------------------------------- -dnl iODBC support -dnl ---------------------------------------------------------------- - -IODBC_C_SRC="" -if test "$wxUSE_ODBC" = "yes" ; then - AC_DEFINE(wxUSE_ODBC) - WXODBCFLAG="-D_IODBC_" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" -fi - dnl ---------------------------------------------------------------- dnl Register PostScript options for makefiles and setup.h dnl ---------------------------------------------------------------- @@ -4734,25 +4760,8 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -dnl if test "$wxUSE_PROLOGIO" = "yes" ; then -dnl AC_DEFINE(wxUSE_PROLOGIO) -dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" -dnl fi - -dnl if test "$wxUSE_RESOURCES" = "yes" ; then -dnl if test "$wxUSE_NANOX" = "yes"; then -dnl AC_MSG_WARN([Cannot use resource database functions in NanoX]) -dnl else -dnl AC_DEFINE(wxUSE_RESOURCES) -dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" -dnl fi -dnl if test "$wxUSE_PROLOGIO" != "yes" ; then -dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" -dnl fi -dnl fi - -if test "$wxUSE_X_RESOURCES" = "yes"; then - AC_DEFINE(wxUSE_X_RESOURCES) +if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then + AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only]) fi dnl --------------------------------------------------------------------------- @@ -5149,6 +5158,11 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" fi +if test "$wxUSE_ACCESSIBILITY" = "yes"; then + AC_DEFINE(wxUSE_ACCESSIBILITY) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" +fi + if test "$wxUSE_MENUS" = "yes"; then AC_DEFINE(wxUSE_MENUS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" @@ -5712,6 +5726,7 @@ echo " png ${wxUSE_LIBPNG-n echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" echo " zlib ${wxUSE_ZLIB}" +echo " odbc ${wxUSE_ODBC}" echo ""