configure without popup windows under Mac OS X

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

diff --git a/configure b/configure
index c61f8d86533c142066b91d0a403a9f4337bd32cc..16cdb7dfa388407fe1fafed0f4a4f693d66c9b29 100755 (executable)
--- a/configure
+++ b/configure
@@ -17114,11 +17114,15 @@ EOF
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2
+    else
+        cat >> confdefs.h <<\EOF

 #define wxUSE_POPUPWIN 1
 EOF
 
 #define wxUSE_POPUPWIN 1
 EOF
 

-    USES_CONTROLS=1
+        USES_CONTROLS=1
+    fi

 fi
 
 if test "$USES_CONTROLS" = 1; then
 fi
 
 if test "$USES_CONTROLS" = 1; then


@@ -17471,7 +17475,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:17475: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:17479: checking whether ${MAKE-make} sets \${MAKE}" >&5

 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index c1523424e6c5544c01ecc66bd80de26d140fd234..233e04b7bd2655358cecee4dc8024e0b0c45607a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4209,8 +4209,12 @@ if test "$wxUSE_TREECTRL" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then

-    AC_DEFINE(wxUSE_POPUPWIN)
-    USES_CONTROLS=1
+    if test "$wxUSE_MAC" = 1; then
+        AC_MSG_WARN(Popup window is not yet supported under Mac OS)
+    else
+        AC_DEFINE(wxUSE_POPUPWIN)
+        USES_CONTROLS=1
+    fi

 fi
 
 if test "$USES_CONTROLS" = 1; then
 fi
 
 if test "$USES_CONTROLS" = 1; then