disable wxUSE_POPUPWIN for Motif

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

diff --git a/configure b/configure
index 0c4b26fd55ceaf3a74ecff36270c1b6ed8487b28..34e46821ad3f459aa9f41950df63f2ed1f781866 100755 (executable)
--- a/configure
+++ b/configure
@@ -18234,19 +18234,23 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
     else
     if test "$wxUSE_MAC" = 1; then
         echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
     else

-        cat >> confdefs.h <<\EOF
+        if test "$wxUSE_MOTIF" = 1; then
+            echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
+        else
+            cat >> confdefs.h <<\EOF

 #define wxUSE_POPUPWIN 1
 EOF
 
 
 #define wxUSE_POPUPWIN 1
 EOF
 
 

-        if test "$wxUSE_TIPWINDOW" = "yes"; then
-            cat >> confdefs.h <<\EOF
+            if test "$wxUSE_TIPWINDOW" = "yes"; then
+                cat >> confdefs.h <<\EOF

 #define wxUSE_TIPWINDOW 1
 EOF
 
 #define wxUSE_TIPWINDOW 1
 EOF
 

-        fi
+            fi

 
 

-        USES_CONTROLS=1
+            USES_CONTROLS=1
+        fi

     fi
 fi
 
     fi
 fi
 


@@ -18641,7 +18645,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:18645: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18649: 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 5a9ac0dd1888e2f6e700db7dad705f6672da2847..eedc8ed2ab61bdb547c07e769d76c87ee21e3815 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4505,13 +4505,17 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else
     if test "$wxUSE_MAC" = 1; then
         AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else

-        AC_DEFINE(wxUSE_POPUPWIN)
+        if test "$wxUSE_MOTIF" = 1; then
+            AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+        else
+            AC_DEFINE(wxUSE_POPUPWIN)

 
 

-        if test "$wxUSE_TIPWINDOW" = "yes"; then
-            AC_DEFINE(wxUSE_TIPWINDOW)
-        fi
+            if test "$wxUSE_TIPWINDOW" = "yes"; then
+                AC_DEFINE(wxUSE_TIPWINDOW)
+            fi

 
 

-        USES_CONTROLS=1
+            USES_CONTROLS=1
+        fi

     fi
 fi
 
     fi
 fi