#endif"
ac_subdirs_all="$ac_subdirs_all src/expat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_WXUSE_EXPAT_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
--enable-pnm use pnm images (PNM file format)
--enable-xpm use xpm images (XPM file format)
--enable-icocur use Windows ICO and CUR formats
+ --enable-official_build official build of wxWindows (win32 DLL only)
+ --enable-vendor=VENDOR vendor name (win32 DLL only)
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtktest Do not try to compile and run a test GTK program
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_MONOLITHIC=yes
+ DEFAULT_wxUSE_OFFICIAL_BUILD=no
else
DEFAULT_wxUSE_UNIVERSAL=no
DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_MONOLITHIC=yes
+ DEFAULT_wxUSE_OFFICIAL_BUILD=no
fi
if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
+ BUILD=debug
elif test "$wxUSE_DEBUG" = "no"; then
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
+ BUILD=release
fi
## FIXME: This is a blatant hack
if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
wxUSE_PRINTING_ARCHITECTURE=no
- wxUSE_CLIPBOARD=no
wxUSE_DRAG_AND_DROP=no
- wxUSE_DATAOBJ=no
# Generic notebook requires tab dialog
DEFAULT_wxUSE_TABDIALOG=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
fi
+
+
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-official_build or --disable-official_build was given.
+if test "${enable_official_build+set}" = set; then
+ enableval="$enable_official_build"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
+ else
+ ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD
+
+fi;
+
+ eval "$ac_cv_use_official_build"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_OFFICIAL_BUILD" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+# Check whether --enable-vendor or --disable-vendor was given.
+if test "${enable_vendor+set}" = set; then
+ enableval="$enable_vendor"
+ VENDOR="$enableval"
+fi;
+if test "x$VENDOR" = "x"; then
+ VENDOR="custom"
+fi
+
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
PATH_IFS=';'
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
TOOLKIT=MAC
GUIDIST=MACX_DIST
+ WXBASEPORT="_carbon"
fi
if test "$wxUSE_COCOA" = 1; then
if test "$TOOLKIT" != "MSW" ; then
- if test "$wxUSE_ODBC" != "no" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
- WXODBCFLAG="-D_IODBC_"
-
-
- if test "$wxUSE_ODBC" = "sys" ; then
+ if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
- if test "${ac_cv_header_sql_h+set}" = set; then
+ if test "${ac_cv_header_sql_h+set}" = set; 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 "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
echo "${ECHO_T}$ac_cv_header_sql_h" >&6
+fi
+if test $ac_cv_header_sql_h = yes; then
+ found_sql_h=1
fi
- echo "$as_me:$LINENO: checking for library containing SQLAllocEnv" >&5
-echo $ECHO_N "checking for library containing SQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_search_SQLAllocEnv+set}" = set; then
+ if test "x$found_sql_h" = "x1" ; then
+ echo "$as_me:$LINENO: checking for iodbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for iodbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_iodbc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS=$LIBS
-ac_cv_search_SQLAllocEnv=no
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char SQLAllocEnv ();
+char iodbc ();
int
main ()
{
-SQLAllocEnv ();
+iodbc ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_SQLAllocEnv="none required"
+ ac_cv_lib_SQLAllocEnv_iodbc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_SQLAllocEnv_iodbc=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_SQLAllocEnv" = no; then
- for ac_lib in iodbc unixodbc odbc ; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_iodbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_iodbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_iodbc = yes; then
+ ODBC_LINK=" -liodbc"
+else
+
+ echo "$as_me:$LINENO: checking for unixodbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for unixodbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_unixodbc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char SQLAllocEnv ();
+char unixodbc ();
int
main ()
{
-SQLAllocEnv ();
+unixodbc ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_SQLAllocEnv="-l$ac_lib"
-break
+ ac_cv_lib_SQLAllocEnv_unixodbc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_SQLAllocEnv_unixodbc=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- done
-fi
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_search_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_search_SQLAllocEnv" >&6
-if test "$ac_cv_search_SQLAllocEnv" != no; then
- test "$ac_cv_search_SQLAllocEnv" = "none required" || LIBS="$ac_cv_search_SQLAllocEnv $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_unixodbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_unixodbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_unixodbc = yes; then
+ ODBC_LINK=" -lunixodbc"
+else
+ echo "$as_me:$LINENO: checking for odbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for odbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_odbc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char odbc ();
+int
+main ()
+{
+odbc ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_SQLAllocEnv_odbc=yes
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_SQLAllocEnv_odbc=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_odbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_odbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_odbc = yes; then
+ ODBC_LINK=" -lodbc"
+fi
+
+
+fi
- wxUSE_ODBC=builtin;
- { echo "$as_me:$LINENO: WARNING: can't find system Odbc library falling back to builtin " >&5
-echo "$as_me: WARNING: can't find system Odbc library falling back to builtin " >&2;}
fi
fi
- if test "$wxUSE_ODBC" != "sys" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+ 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" != "no" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ODBC 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+ WXODBCFLAG="-D_IODBC_"
+ fi
fi
if test "$wxUSE_REGEX" = "builtin" ; then
if test "$ac_find_includes" != "" ; then
echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
echo "${ECHO_T}found in $ac_find_includes" >&6
- set -x
if test "x$ac_find_includes" = "x/usr/include"; then
ac_path_to_include=""
fi
CPPFLAGS="$CPPFLAGS$ac_path_to_include"
- set +x
fi
if test "${ac_cv_header_GL_gl_h+set}" = set; then
fi
fi
- if "$found_gl" != 1; then
+ if test "$found_gl" != 1; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking for -lMesaGL" >&5
fi
lib_debug_suffix=
-BUILD=release
+DEBUG_FLAG=0
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
lib_debug_suffix=d
- BUILD=debug
+ DEBUG_FLAG=1
fi
-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+DEBUG_INFO=0
+if test "$wxUSE_DEBUG_INFO" = "yes"; then
+ DEBUG_INFO=1
+fi
+
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
-WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-ESD_LINK=
-if test "${ac_cv_header_esd_h+set}" = set; then
- echo "$as_me:$LINENO: checking for esd.h" >&5
-echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-if test "${ac_cv_header_esd_h+set}" = set; then
+EXTRALIBS_ESD=
+echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5
+echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6
+if test "${ac_cv_lib_esd_esd_close+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lesd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char esd_close ();
+int
+main ()
+{
+esd_close ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_esd_esd_close=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_esd_esd_close=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_close" >&5
+echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6
+if test $ac_cv_lib_esd_esd_close = yes; then
+
+
+for ac_header in esd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-echo "${ECHO_T}$ac_cv_header_esd_h" >&6
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking esd.h usability" >&5
-echo $ECHO_N "checking esd.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <esd.h>
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
-echo "$as_me:$LINENO: checking esd.h presence" >&5
-echo $ECHO_N "checking esd.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <esd.h>
+#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
- { echo "$as_me:$LINENO: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
no:yes )
- { echo "$as_me:$LINENO: WARNING: esd.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: esd.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: esd.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for esd.h" >&5
-echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-if test "${ac_cv_header_esd_h+set}" = set; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_esd_h=$ac_header_preproc
+ eval "$as_ac_Header=$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-echo "${ECHO_T}$ac_cv_header_esd_h" >&6
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
fi
-if test $ac_cv_header_esd_h = yes; then
-
- echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5
-echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6
-if test "${ac_cv_lib_esd_esd_close+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lesd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char esd_close ();
-int
-main ()
-{
-esd_close ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_esd_esd_close=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ EXTRALIBS_ESD="-lesd"
-ac_cv_lib_esd_esd_close=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_close" >&5
-echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6
-if test $ac_cv_lib_esd_esd_close = yes; then
-
- ESD_LINK="-lesd"
-fi
+done
fi
{ echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
wxUSE_JOYSTICK=no
- fi
- if test "$TOOLKIT" = "MOTIF"; then
- { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Motif... disabled" >&2;}
- wxUSE_JOYSTICK=no
- fi
- if test "$TOOLKIT" = "X11"; then
- { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under X11... disabled" >&2;}
- wxUSE_JOYSTICK=no
fi
- if test "$TOOLKIT" != "MSW"; then
+ if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then
for ac_header in linux/joystick.h
#define wxUSE_DYNAMIC_LOADER 1
_ACEOF
-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+fi
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DYNLIB_CLASS 1
_ACEOF
#define wxUSE_SYSTEM_OPTIONS 1
_ACEOF
-if test "$TOOLKIT" = "MSW"; then
+if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+ "$TOOLKIT" = "MOTIF"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
fi
+CORE_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+ CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+ CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+ CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+if test "$wxUSE_HTML" = "yes" ; then
+ CORE_GUI_LIBS="html $CORE_GUI_LIBS"
+fi
+
+
+
+
+
+
+
if test "$wxUSE_MAC" = 1 ; then
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
LIBS=`echo $LIBS | sed 's/ \+/ /g'`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
+EXTRALIBS_ODBC="$ODBC_LINK"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
fi
WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
fi
+WXCONFIG_EXTRALIBS="$LIBS"
+
+if test "$wxUSE_REGEX" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty regex"
+fi
+if test "$wxUSE_EXPAT" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty expat"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+fi
+if test "$wxUSE_LIBJPEG" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+fi
+if test "$wxUSE_LIBPNG" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty png"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty zlib"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+
+for i in $wxconfig_3rdparty ; do
+ WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}"
+done
+
+
if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
WXUNIV=1
else
MONOLITHIC=0
fi
-VENDOR="custom"
-OFFICIAL_BUILD=0
+if test $wxUSE_ODBC != "no" ; then
+ USE_ODBC=1
+else
+ USE_ODBC=0
+fi
+
+if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
+ OFFICIAL_BUILD=1
+else
+ OFFICIAL_BUILD=0
+fi
+
+
+
+
+
SO_SUFFIX="so"
+ SO_SUFFIX_MODULE="so"
EXEEXT=""
DLLPREFIX=lib
+ DLLPREFIX_MODULE=
case "${host}" in
*-hp-hpux* )
SO_SUFFIX="sl"
+ SO_SUFFIX_MODULE="sl"
;;
*-*-aix* )
SO_SUFFIX="a"
+ SO_SUFFIX_MODULE="a"
;;
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll"
+ SO_SUFFIX_MODULE="dll"
EXEEXT=".exe"
DLLPREFIX=""
;;
;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
+ SO_SUFFIX_MODULE="bundle"
;;
esac
+
+
SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o"
verbose=0
args=""
objects=""
+linking_flag="-dynamiclib"
while test \${#} -gt 0; do
case \${1} in
args="\${args} \${1}"
;;
- -dynamiclib)
- # skip these options
+ -dynamiclib|-bundle)
+ linking_flag="\${1}"
;;
-*)
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
- echo "cc -dynamiclib master.\$\$.o \${args}"
+ echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
EOF
chmod +x shared-ld-sh
- SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+ SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
+ SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_CC"
+ SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
PIC_FLAG="-dynamic -fPIC"
;;
{ (exit 1); exit 1; }; }
esac
+ if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+ SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+ fi
+ if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+ SHARED_LD_MODULE_CC="$SHARED_LD_CXX"
+ fi
+
+
+
COND_BUILD_DEBUG=""
fi
+ COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+ COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
+ fi
+
+ COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
+ fi
+
COND_BUILD_RELEASE="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_RELEASE=""
fi
+ COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
+ if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
+ fi
+
+ COND_DEBUG_FLAG_1="#"
+ if test "x$DEBUG_FLAG" = "x1" ; then
+ COND_DEBUG_FLAG_1=""
+ fi
+
+ COND_DEBUG_INFO_0="#"
+ if test "x$DEBUG_INFO" = "x0" ; then
+ COND_DEBUG_INFO_0=""
+ fi
+
+ COND_DEBUG_INFO_1="#"
+ if test "x$DEBUG_INFO" = "x1" ; then
+ COND_DEBUG_INFO_1=""
+ fi
+
COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0=""
COND_USE_GUI_1_WXUNIV_1=""
fi
+ COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+ fi
+
+ COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+ fi
+
+ COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+ fi
+
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
COND_WXUNIV_1=""
fi
+ COND_WXUSE_EXPAT_BUILTIN="#"
+ if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+ COND_WXUSE_EXPAT_BUILTIN=""
+ fi
+
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
COND_SHARED_0=""
fi
- COND_WXUSE_EXPAT_BUILTIN="#"
- if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
- COND_WXUSE_EXPAT_BUILTIN=""
+ COND_TOOLKIT_MAC_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_MAC_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OS2_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OS2_USE_GUI_1=""
+ fi
+
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
+ fi
+
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
fi
s,@DEREZ@,$DEREZ,;t t
s,@SETFILE@,$SETFILE,;t t
s,@LIBICONV@,$LIBICONV,;t t
+s,@EXTRALIBS_ESD@,$EXTRALIBS_ESD,;t t
+s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t
+s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t
s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t
s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t
s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t
s,@MONOLITHIC@,$MONOLITHIC,;t t
s,@EXTRALIBS@,$EXTRALIBS,;t t
s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t
+s,@EXTRALIBS_ODBC@,$EXTRALIBS_ODBC,;t t
s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
s,@UNICODE@,$UNICODE,;t t
s,@BUILD@,$BUILD,;t t
+s,@DEBUG_INFO@,$DEBUG_INFO,;t t
+s,@DEBUG_FLAG@,$DEBUG_FLAG,;t t
s,@SHARED@,$SHARED,;t t
s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t
s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t
s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
s,@SO_SUFFIX@,$SO_SUFFIX,;t t
+s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
s,@DLLPREFIX@,$DLLPREFIX,;t t
+s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
+s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
+s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
s,@PIC_FLAG@,$PIC_FLAG,;t t
s,@USE_SOVERSION@,$USE_SOVERSION,;t t
s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
s,@SONAME_FLAG@,$SONAME_FLAG,;t t
s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t
+s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t
s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
+s,@COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT@,$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT,;t t
+s,@COND_DEBUG_FLAG_1@,$COND_DEBUG_FLAG_1,;t t
+s,@COND_DEBUG_INFO_0@,$COND_DEBUG_INFO_0,;t t
+s,@COND_DEBUG_INFO_1@,$COND_DEBUG_INFO_1,;t t
s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
+s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
s,@COND_SHARED_1@,$COND_SHARED_1,;t t
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
-s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;t t
s,@LEX_STEM@,$LEX_STEM,;t t
s,@PATH_IFS@,$PATH_IFS,;t t
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
s,@WX_RELEASE_NUMBER@,$WX_RELEASE_NUMBER,;t t
s,@WX_LIBRARY_NAME_STATIC@,$WX_LIBRARY_NAME_STATIC,;t t
s,@WX_LIBRARY_NAME_SHARED@,$WX_LIBRARY_NAME_SHARED,;t t
-s,@WX_LIBRARY_BASENAME@,$WX_LIBRARY_BASENAME,;t t
+s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t
+s,@WX_LIBRARY_BASENAME_GUI@,$WX_LIBRARY_BASENAME_GUI,;t t
s,@WX_LIBRARY_IMPORTLIB@,$WX_LIBRARY_IMPORTLIB,;t t
s,@WX_TARGET_LIBRARY@,$WX_TARGET_LIBRARY,;t t
s,@WX_LIBRARY_LINK1@,$WX_LIBRARY_LINK1,;t t
s,@TOOLCHAIN_DLL_DEFS@,$TOOLCHAIN_DLL_DEFS,;t t
s,@top_builddir_wxconfig@,$top_builddir_wxconfig,;t t
s,@cross_compiling@,$cross_compiling,;t t
+s,@WXCONFIG_EXTRALIBS@,$WXCONFIG_EXTRALIBS,;t t
s,@WXCONFIG_LIBS@,$WXCONFIG_LIBS,;t t
s,@WXCONFIG_LIBS_GL@,$WXCONFIG_LIBS_GL,;t t
s,@WXCONFIG_LIBS_STATIC@,$WXCONFIG_LIBS_STATIC,;t t
s,@LD@,$LD,;t t
s,@MAKEINFO@,$MAKEINFO,;t t
s,@INSTALL_LIBRARY@,$INSTALL_LIBRARY,;t t
-s,@ESD_LINK@,$ESD_LINK,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
projects / wxWidgets.git / blobdiff