I really don't have to point out what went wrong here, do I?

Ryan, please fix this problem at the source, this is not funny
anymore.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 0ef715cde521ac3425dfdd4e054271fece4977cc..513ae6e5836005fa49d0c38470bea9d8aa984bd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -27433,7 +27433,7 @@ done
 _ACEOF
 
            LIBS="$LIBS -lstrmiids"
-       if
+       fi
     fi
 fi
 
@@ -37522,7 +37522,7 @@ fi
 
 
 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

diff --git a/configure.in b/configure.in
index becc12be8248b0d72c0b4498cd133de4b2a6d049..b2c7d5d36b8425284e45bb0c0919becbd84ddb4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3183,7 +3183,7 @@ dnl ---------------------------------------------------------------------------
        if test "$wxUSE_DIRECTSHOW" = "yes"; then
           AC_DEFINE(wxUSE_DIRECTSHOW)
            LIBS="$LIBS -lstrmiids"          
-       if
+       fi
     fi
 fi
 
@@ -5838,7 +5838,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
-    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