[Gnash-commit] /srv/bzr/gnash/trunk r10598: make sure the right version of kde is installed. Fixes #25613

[rob]

------------------------------------------------------------
revno: 10598
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-02-19 08:59:33 -0700
message:
  make sure the right version of kde is installed. Fixes #25613
modified:
  configure.ac
  macros/kde3.m4
  macros/kde4.m4

=== modified file 'configure.ac'
--- a/configure.ac      2009-02-19 04:39:03 +0000
+++ b/configure.ac      2009-02-19 15:59:33 +0000
@@ -1336,7 +1336,7 @@
 AC_CHECK_HEADERS(signal.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_LIB(lber, ber_free)
+#AC_CHECK_LIB(lber, ber_free)
 AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
 dnl X11 is needed for fltk (at least),

=== modified file 'macros/kde3.m4'
--- a/macros/kde3.m4    2008-11-14 22:22:01 +0000
+++ b/macros/kde3.m4    2009-02-19 15:59:33 +0000
@@ -94,8 +94,8 @@
       if test x"${ac_cv_path_kde3_incl}" = x ; then
         AC_MSG_CHECKING([for KDE 3.x header path])
         dnl incllist is inherited from configure.ac, and lives in /macros
-        for i in ${kde3_prefix}/include ${incllist}; do
-          if test -f $i/kde/kapplication.h; then
+        for i in ${kde3_prefix}/include ${incllist}; do 
+         if test -f $i/kde/kapplication.h; then
             ac_cv_path_kde3_incl="-I$i/kde"
             kde3_prefix=`dirname $i`
             break
@@ -106,6 +106,10 @@
             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-15 15:34:26 +0000
+++ b/macros/kde4.m4    2009-02-19 15:59:33 +0000
@@ -96,7 +96,7 @@
       if test x"${ac_cv_path_kde4_incl}" = x ; then
         dnl incllist is inherited from configure.ac, and lives in /macros
         for i in ${kde4_prefix}/include $incllist; do
-          if test -f $i/kde4/kapplication.h; then
+          if test -f $i/kde4/kapplication.h; then          
             ac_cv_path_kde4_incl="-I$i/kde4"
             kde4_prefix=`dirname $i`
             break
@@ -112,6 +112,10 @@
             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})