don't include strmiids.lib as its not needed by default anymore

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index becc12be8248b0d72c0b4498cd133de4b2a6d049..d901b515e0eb97666579576e36e762b39c100f49 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,9 +64,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
 
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$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_REVISION=0

-WX_AGE=1
+WX_AGE=2

 
 
 dnl ------------------------------------------------------------------------
 
 
 dnl ------------------------------------------------------------------------


@@ -799,7 +799,7 @@ WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file for
 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_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 audio printing under Unix], wxUSE_LIBGNOMEPRINT)
+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_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
 
 fi


@@ -3183,8 +3183,10 @@ dnl ---------------------------------------------------------------------------
        if test "$wxUSE_DIRECTSHOW" = "yes"; then
           AC_DEFINE(wxUSE_DIRECTSHOW)
            LIBS="$LIBS -lstrmiids"          
        if test "$wxUSE_DIRECTSHOW" = "yes"; then
           AC_DEFINE(wxUSE_DIRECTSHOW)
            LIBS="$LIBS -lstrmiids"          

-       if
+       fi

     fi
     fi

+    
+    AC_DEFINE(wxUSE_MEDIACTRL)

 fi
 
 dnl ---------------------------------------------------------------------------
 fi
 
 dnl ---------------------------------------------------------------------------


@@ -3475,6 +3477,9 @@ AC_TYPE_SIZE_T
 dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
 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
 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


@@ -5838,7 +5843,7 @@ dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in
 
 if test "$wxUSE_MAC" = 1 ; then
 dnl extended.c uses floor() and is always linked in
 
 if test "$wxUSE_MAC" = 1 ; then

-    if test "$wxUSE_SOUND" = "yes"; -o "$wxUSE_MEDIACTRL" = "yes"; then
+    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then

        LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
     if test "$USE_DARWIN" = 1; then
        LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
     if test "$USE_DARWIN" = 1; then