[Gnash-commit] /srv/bzr/gnash/trunk r10599: make sure kde3, kde4 test works on OpenBSD 4.4.

[rob]

------------------------------------------------------------
revno: 10599
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-02-19 10:04:32 -0700
message:
  make sure kde3,kde4 test works on OpenBSD 4.4.
modified:
  macros/kde3.m4
  macros/kde4.m4

=== modified file 'macros/kde3.m4'
--- a/macros/kde3.m4    2009-02-19 15:59:33 +0000
+++ b/macros/kde3.m4    2009-02-19 17:04:32 +0000
@@ -98,18 +98,22 @@
          if test -f $i/kde/kapplication.h; then
             ac_cv_path_kde3_incl="-I$i/kde"
             kde3_prefix=`dirname $i`
+            if test ! -f $i/kde/qxembed.h -a x"${build_kde4}" = x"no"; then
+              AC_MSG_ERROR([You specified building kde3, but you have kde4 
installed!])
+              break
+            fi
             break
           fi
           if test -f $i/kapplication.h; then
             ac_cv_path_kde3_incl="-I$i"
             kde3_prefix=`dirname $i`
+            if test ! -f $i/qxembed.h -a x"${build_kde4}" = x"no"; then
+              AC_MSG_ERROR([You specified building kde3, but you have kde4 
installed!])
+              break
+            fi
             break
           fi
         done
-        if test ! -f $i/kde/qxembed.h -a x"${build_kde4}" = x"no"; then
-          AC_MSG_ERROR([You specified building kde3, but you have kde4 
installed!])
-          break
-        fi
       fi
       if test x"${ac_cv_path_kde3_incl}" != x ; then
         AC_MSG_RESULT(${ac_cv_path_kde3_incl})

=== modified file 'macros/kde4.m4'
--- a/macros/kde4.m4    2009-02-19 15:59:33 +0000
+++ b/macros/kde4.m4    2009-02-19 17:04:32 +0000
@@ -104,18 +104,20 @@
           if test -f $i/kde/kapplication.h; then
             ac_cv_path_kde4_incl="-I$i/kde"
             kde4_prefix=`dirname $i`
+            if test -f $i/kde/qxembed.h -a x"${build_kde3}" = x"no"; then
+              AC_MSG_ERROR([You specified building kde4, but you have kde3 
installed!])
+            fi
             break
           fi
           if test -f $i/kapplication.h; then
             ac_cv_path_kde4_incl="-I$i"
             kde4_prefix=`dirname $i`
+            if test -f $i/qxembed.h -a x"${build_kde3}" = x"no"; then
+              AC_MSG_ERROR([You specified building kde4, but you have kde3 
installed!])
+            fi
             break
           fi
         done
-        if test -f $i/kde/qxembed.h -a x"${build_kde3}" = x"no"; then
-          AC_MSG_ERROR([You specified building kde4, but you have kde3 
installed!])
-          break
-        fi
       fi
       if test x"${ac_cv_path_kde4_incl}" != x ; then
         AC_MSG_RESULT(${ac_cv_path_kde4_incl})