Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ODBC and DBgrid libraries

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-23 13:40:27 +00:00
parent f283c68310
commit 1e6b2edfc8
232 changed files with 675 additions and 48388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

407
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 49200 2007-10-17 17:55:25Z VZ .
# From configure.in Id: configure.in 49284 2007-10-21 11:39:33Z MW .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -723,7 +723,6 @@ STD_GUI_LIBS
wxUSE_ZLIB
wxUSE_REGEX
wxUSE_EXPAT
wxUSE_ODBC
wxUSE_LIBJPEG
wxUSE_LIBPNG
wxUSE_LIBTIFF
@@ -738,7 +737,6 @@ CXXWARNINGS
EXTRALIBS
EXTRALIBS_XML
EXTRALIBS_HTML
EXTRALIBS_ODBC
EXTRALIBS_GUI
EXTRALIBS_OPENGL
EXTRALIBS_SDL
@@ -1901,7 +1899,6 @@ Optional Packages:
--with-sdl use SDL for audio on Unix
--with-regex enable support for wxRegEx class
--with-zlib use zlib for LZW compression
--with-odbc use the IODBC and wxODBC classes
--with-expat enable XML support using expat parser
--with-macosx-sdk=PATH use an OS X SDK at PATH
--with-macosx-version-min=VER build binaries which require at least this OS X version
@@ -2944,7 +2941,6 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
@@ -4400,66 +4396,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
fi
{ echo "$as_me:$LINENO: checking for --with-odbc" >&5
echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
# Check whether --with-odbc was given.
if test "${with_odbc+set}" = set; then
withval=$with_odbc;
if test "$withval" = yes; then
wx_cv_use_odbc='wxUSE_ODBC=yes'
elif test "$withval" = no; then
wx_cv_use_odbc='wxUSE_ODBC=no'
elif test "$withval" = sys; then
wx_cv_use_odbc='wxUSE_ODBC=sys'
elif test "$withval" = builtin; then
wx_cv_use_odbc='wxUSE_ODBC=builtin'
else
{ { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
cache=yes
else
LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
cache=yes
else
cache=no
fi
wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_odbc"
if test "x$cache" = xyes; then
echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_ODBC" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
elif test "$wxUSE_ODBC" = no; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
elif test "$wxUSE_ODBC" = sys; then
{ echo "$as_me:$LINENO: result: system version" >&5
echo "${ECHO_T}system version" >&6; }
elif test "$wxUSE_ODBC" = builtin; then
{ echo "$as_me:$LINENO: result: builtin version" >&5
echo "${ECHO_T}builtin version" >&6; }
else
{ { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
{ echo "$as_me:$LINENO: checking for --with-expat" >&5
echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
@@ -30559,17 +30495,6 @@ fi
LIBS="$LIBS -lkernel32 -luser32"
esac
if test "$wxUSE_ODBC" = "sys" ; then
wxUSE_ODBC = "yes"
fi
if test "$wxUSE_ODBC" = "yes" ; then
LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ODBC 1
_ACEOF
fi
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
@@ -35393,299 +35318,6 @@ fi
IODBC_C_SRC=""
if test "$TOOLKIT" != "MSW" ; then
if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
{ echo "$as_me:$LINENO: checking for sql.h" >&5
echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
if test "${ac_cv_header_sql_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sql.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_sql_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_sql_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
echo "${ECHO_T}$ac_cv_header_sql_h" >&6; }
if test $ac_cv_header_sql_h = yes; then
found_sql_h=1
fi
if test "x$found_sql_h" = "x1" ; then
{ echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; }
if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-liodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SQLAllocEnv ();
int
main ()
{
return SQLAllocEnv ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_lib_iodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iodbc_SQLAllocEnv=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; }
if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
ODBC_LINK=" -liodbc"
else
{ echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; }
if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lunixodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SQLAllocEnv ();
int
main ()
{
return SQLAllocEnv ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_lib_unixodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_unixodbc_SQLAllocEnv=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; }
if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
ODBC_LINK=" -lunixodbc"
else
{ echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; }
if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SQLAllocEnv ();
int
main ()
{
return SQLAllocEnv ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_lib_odbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_odbc_SQLAllocEnv=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; }
if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
ODBC_LINK=" -lodbc"
fi
fi
fi
fi
if test "x$ODBC_LINK" = "x" ; then
if test "$wxUSE_ODBC" = "sys" ; then
{ { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
{ (exit 1); exit 1; }; }
else
{ echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
wxUSE_ODBC=builtin
fi
else
wxUSE_ODBC=sys
fi
fi
if test "$wxUSE_ODBC" = "builtin" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_BUILTIN_IODBC 1
_ACEOF
fi
fi
if test "$wxUSE_ODBC" != "no" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ODBC 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
fi
if test "$wxUSE_DISPLAY" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
{ echo "$as_me:$LINENO: checking for Xinerama" >&5
@@ -49461,15 +49093,12 @@ _ACEOF
STD_BASE_LIBS="base"
STD_GUI_LIBS=""
BUILT_WX_LIBS="base"
ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
if test "$wxUSE_SOCKETS" = "yes" ; then
STD_BASE_LIBS="net $STD_BASE_LIBS"
BUILT_WX_LIBS="net $BUILT_WX_LIBS"
fi
if test "$wxUSE_ODBC" != "no" ; then
BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
fi
if test "$wxUSE_XML" = "yes" ; then
STD_BASE_LIBS="xml $STD_BASE_LIBS"
BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
@@ -49483,9 +49112,6 @@ if test "$wxUSE_GUI" = "yes"; then
STD_GUI_LIBS="qa $STD_GUI_LIBS"
BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
fi
if test "$wxUSE_ODBC" != "no" ; then
BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
fi
if test "$wxUSE_HTML" = "yes" ; then
STD_GUI_LIBS="html $STD_GUI_LIBS"
BUILT_WX_LIBS="html $BUILT_WX_LIBS"
@@ -49606,7 +49232,6 @@ LIBS=`echo $LIBS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_ODBC="$ODBC_LINK"
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -49625,9 +49250,6 @@ fi
if test "$wxUSE_EXPAT" = "builtin" ; then
wxconfig_3rdparty="expat $wxconfig_3rdparty"
fi
if test "$wxUSE_ODBC" = "builtin" ; then
wxconfig_3rdparty="odbc $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
wxconfig_3rdparty="tiff $wxconfig_3rdparty"
fi
@@ -49676,7 +49298,6 @@ fi
if test $wxUSE_MONOLITHIC = "yes" ; then
MONOLITHIC=1
else
@@ -49689,12 +49310,6 @@ else
USE_PLUGINS=0
fi
if test $wxUSE_ODBC != "no" ; then
USE_ODBC=1
else
USE_ODBC=0
fi
if test "$wxUSE_DEBUGREPORT" = "yes" ; then
USE_QA=1
else
@@ -49730,7 +49345,6 @@ fi
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
@@ -54129,7 +53743,6 @@ STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim
wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
wxUSE_REGEX!$wxUSE_REGEX$ac_delim
wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
wxUSE_ODBC!$wxUSE_ODBC$ac_delim
wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim
wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim
wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim
@@ -54144,7 +53757,6 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim
EXTRALIBS!$EXTRALIBS$ac_delim
EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim
EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
@@ -54216,6 +53828,8 @@ GCC_PCH!$GCC_PCH$ac_delim
ICC_PCH!$ICC_PCH$ac_delim
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54257,8 +53871,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
@@ -54354,6 +53966,8 @@ COND_SHARED_1!$COND_SHARED_1$ac_delim
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54395,8 +54009,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
@@ -54492,6 +54104,8 @@ WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
GUIDIST!$GUIDIST$ac_delim
DISTDIR!$DISTDIR$ac_delim
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54533,8 +54147,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
DISTDIR!$DISTDIR$ac_delim
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -54554,7 +54166,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -55212,7 +54824,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
echo " xpm ${wxUSE_LIBXPM-none}"
fi
echo " zlib ${wxUSE_ZLIB}"
echo " odbc ${wxUSE_ODBC}"
echo " expat ${wxUSE_EXPAT}"
echo " libmspack ${wxUSE_LIBMSPACK}"
echo " sdl ${wxUSE_LIBSDL}"