wx_major_version_number=2
wx_minor_version_number=5
wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=3
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
-WX_CURRENT=4
+WX_CURRENT=3
WX_REVISION=0
-WX_AGE=1
+WX_AGE=3
dnl ------------------------------------------------------------------------
AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_MAC=1
;;
+ powerpc-apple-macos* )
+ dnl Classic Mac OS (< X)
+ USE_UNIX=0
+ dnl For some reason the test that should be cross-compiler capable fails
+ dnl However, there is no doubt that MacOS PowerPC is big endian.
+ ac_cv_c_bigendian=yes
+ SO_SUFFIX=shlib
+ dnl AC_DEFINE(TARGET_CARBON)
+ dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
+ DEFAULT_DEFAULT_wxUSE_MAC=1
+ ;;
*-*-beos* )
dnl leave USE_UNIX on - BeOS is sufficiently Unix-like for this
DEFAULT_wxUSE_LIBXPM=no
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
+ DEFAULT_wxUSE_LIBGNOMEPRINT=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_TEXTBUFFER=no
DEFAULT_wxUSE_TEXTFILE=no
DEFAULT_wxUSE_SOUND=no
+ DEFAULT_wxUSE_MEDIACTRL=no
+ DEFAULT_wxUSE_DIRECTSHOW=no
DEFAULT_wxUSE_INTL=no
DEFAULT_wxUSE_CONFIG=no
DEFAULT_wxUSE_FONTMAP=no
DEFAULT_wxUSE_LIBXPM=yes
DEFAULT_wxUSE_LIBMSPACK=yes
DEFAULT_wxUSE_LIBSDL=no
+ DEFAULT_wxUSE_LIBGNOMEPRINT=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_TEXTBUFFER=yes
DEFAULT_wxUSE_TEXTFILE=yes
DEFAULT_wxUSE_SOUND=yes
+ DEFAULT_wxUSE_MEDIACTRL=no
+ DEFAULT_wxUSE_DIRECTSHOW=no
DEFAULT_wxUSE_INTL=yes
DEFAULT_wxUSE_CONFIG=yes
DEFAULT_wxUSE_FONTMAP=yes
WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file format)], wxUSE_LIBXPM)
WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
WX_ARG_WITH(sdl, [ --with-sdl use SDL for audio on Unix], wxUSE_LIBSDL)
+WX_ARG_WITH(gnomeprint, [ --with-gnomeprint use GNOME print for printing under Unix], wxUSE_LIBGNOMEPRINT)
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
fi
WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER)
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
+WX_ARG_ENABLE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM)
dnl cross-compiling support: we're cross compiling if the build system is
dnl different from the target one (assume host and target be always the same)
if test "$build" != "$host" ; then
- if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
+ if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX" = 1; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
DLLTOOL=$host_alias-dlltool
RESCOMP=$host_alias-windres
STRIP=$host_alias-strip
+ elif test "x$CC" '!=' "x"; then
+ echo "You set CC, I assume you know what you are doing."
else
AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
fi
va_copy(ap2, ap1);
va_end(ap2);
va_end(ap1);
+ }
+ int main()
+ {
+ return foo("hi", 17);
}],
wx_cv_func_va_copy=yes,
wx_cv_func_va_copy=no
esac
if test "$WXGTK20" = 1; then
- if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
- PKG_CHECK_MODULES(PANGOFT2, pangoft2,
- [
- CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
- # FIXME: GTK_LIBS already has a lot of what this is
- # about to add, but we go ahead and just add
- # it all again anyway.
- # This is not a good way to manage things. And simply
- # uniq'ing the list later is hardly better.
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
- ],
- [
- AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
- wxUSE_PRINTING_ARCHITECTURE="no"
- ]
- )
- fi
-
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
+
AC_CHECK_FUNCS([pango_font_family_is_monospace])
+
+ dnl test if we have at least GTK+ 2.4:
+ AC_MSG_CHECKING([if GTK+ is version >= 2.4])
+ AC_TRY_COMPILE([
+ #include <gtk/gtk.h>
+ ],
+ [
+ #if !GTK_CHECK_VERSION(2,4,0)
+ #error "Not GTK+ 2.4"
+ #endif
+ ],
+ [
+ AC_DEFINE(__WXGTK24__)
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ])
+
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else
AC_MSG_RESULT([none])
fi
- CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+ if test "x$wxUSE_UNIX" = "xyes"; then
+ CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+ else
+ dnl platform.h needs TARGET_CARBON before setup.h
+ CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON"
+ fi
TOOLKIT=MAC
dnl we can't call this MAC_DIST or autoconf thinks its a macro
fi
fi
+dnl ---------------------------------------------------------------------------
+dnl wxMediaCtrl
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_MEDIACTRL" = "yes"; then
+ if test "$wxUSE_MSW" = 1; then
+dnl ---------------------------------------------------------------------------
+dnl DirectShow MSW
+dnl ---------------------------------------------------------------------------
+ wxUSE_DIRECTSHOW="yes"
+ AC_CHECK_HEADERS([dshow.h], [], [
+ wxUSE_DIRECTSHOW="no"
+ AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
+ ] )
+
+ if test "$wxUSE_DIRECTSHOW" = "yes"; then
+ AC_DEFINE(wxUSE_DIRECTSHOW)
+ LIBS="$LIBS -lstrmiids"
+ fi
+ fi
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
+ AC_DEFINE(wxUSE_MEDIACTRL)
+fi
+
dnl ---------------------------------------------------------------------------
dnl OpenGL libraries
dnl ---------------------------------------------------------------------------
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
dnl base name of the resource file for wxMac must be the same
dnl as library installation base name (-install_name)
- WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r"
- WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc"
+ WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+ WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
dnl add the resources target for wxMac
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
dnl defines uid_t and gid_t if not already defined
AC_TYPE_UID_T
+dnl sets HAVE_SSIZE_T if ssize_t is defined
+AC_CHECK_TYPES(ssize_t)
+
dnl check what exactly size_t is on this machine - this is necessary to avoid
dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
AC_LANG_SAVE
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
+if test "$WXGTK20" = 1; then
+ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+ if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
+
+ PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
+ [libgnomeprintui-2.2 >= 2.8],
+ [
+ EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
+ CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
+ AC_DEFINE(wxUSE_LIBGNOMEPRINT)
+ ],
+ [
+ AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+ wxUSE_LIBGNOMEPRINT="no"
+ ]
+ )
+ fi
+ fi
+fi
+
+
if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
AC_DEFINE(wxUSE_CMDLINE_PARSER)
fi
fi
fi
if test "$wxUSE_WEBKIT" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c++"
AC_CHECK_HEADER([WebKit/HIWebView.h],
fi
dnl ---------------------------------------------------------------------------
-dnl get the string with OS info - used by wxGetOsDescription()
+dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
dnl ---------------------------------------------------------------------------
if test "$cross_compiling" = "yes"; then
dnl extended.c uses floor() and is always linked in
if test "$wxUSE_MAC" = 1 ; then
- if test "$wxUSE_SOUND" = "yes"; then
- LDFLAGS="$LDFLAGS -framework QuickTime"
+ if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
+ if test "$USE_DARWIN" = 1; then
+ LDFLAGS="$LDFLAGS -framework QuickTime"
+ else
+ LDFLAGS="$LDFLAGS -lQuickTimeLib"
+ fi
fi
if test "$USE_DARWIN" = 1; then
- LDFLAGS="$LDFLAGS -framework IOKit"
+ LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
+ else
+ LDFLAGS="$LDFLAGS -lCarbonLib"
fi
- LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework System"
fi
if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework Cocoa"
AC_SUBST(EXTRALIBS_OPENGL)
AC_SUBST(EXTRALIBS_SDL)
AC_SUBST(WITH_PLUGIN_SDL)
+AC_SUBST(EXTRALIBS_GNOMEPRINT)
AC_SUBST(UNICODE)
AC_SUBST(BUILD)
AC_SUBST(DEBUG_INFO)
echo " expat ${wxUSE_EXPAT}"
echo " libmspack ${wxUSE_LIBMSPACK}"
echo " sdl ${wxUSE_LIBSDL}"
+echo " gnomeprint ${wxUSE_LIBGNOMEPRINT}"
echo ""
projects / wxWidgets.git / blobdiff