check for qt's moc preprocessor explicitly and use it

Original commit message from CVS:
* configure.ac:
* ext/kio/Makefile.am:
check for qt's moc preprocessor explicitly and use it

diff --git a/ChangeLog b/ChangeLog
index 88ccdbd..be60a0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-05  Benjamin Otte  <otte@gnome.org>
+
+       * configure.ac:
+       * ext/kio/Makefile.am:
+         check for qt's moc preprocessor explicitly and use it
+
 2004-06-03  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
 
        * gst/tcp/gsttcp.c: (gst_tcp_socket_write):

diff --git a/configure.ac b/configure.ac
index 0fb8376..1f76bd1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1072,59 +1072,64 @@ dnl * KDE *
 
 translit(dnm, m, l) AM_CONDITIONAL(USE_KIO, true)
 GST_CHECK_FEATURE(KIO, [kio], kio, [
-  AC_PATH_PROG(KDE_CONFIG, kde-config, no)
-
-  if test x$KDE_CONFIG != xno; then
-    KDE_PREFIX=`$KDE_CONFIG --prefix`
-  fi
+  AC_PATH_PROG(KDE_MOC, moc, no)
+  if test x$KDE_MOC = xno; then
+    HAVE_KIO="false"
+  else
+    AC_PATH_PROG(KDE_CONFIG, kde-config, no)
 
-  kde_include_dirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include"
-  kde_lib_dirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib"
+    if test x$KDE_CONFIG != xno; then
+      KDE_PREFIX=`$KDE_CONFIG --prefix`
+    fi
 
-  if test -n "$KDE_PREFIX"; then
-    kde_include_dirs="$KDE_PREFIX/include $KDE_PREFIX/include/kde $KDE_PREFIX $kde_include_dirs"
-    kde_lib_dirs="$KDE_PREFIX/lib $KDE_PREFIX $kde_lib_dirs"
-  fi
-  if test -n "$KDEDIR"; then
-    kde_include_dirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_include_dirs"
-    kde_lib_dirs="$KDEDIR/lib $KDEDIR $kde_lib_dirs"
-  fi
+    kde_include_dirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include"
+    kde_lib_dirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib"
 
-  for dir in $kde_include_dirs; do
-    if test -r "$dir/kglobal.h" && test -r "$dir/kdemacros.h"; then
-      kde_include_dir=$dir
-      break
+    if test -n "$KDE_PREFIX"; then
+      kde_include_dirs="$KDE_PREFIX/include $KDE_PREFIX/include/kde $KDE_PREFIX $kde_include_dirs"
+      kde_lib_dirs="$KDE_PREFIX/lib $KDE_PREFIX $kde_lib_dirs"
     fi
-  done
-
-  for dir in $kde_lib_dirs; do
-    try="ls -1 $dir/libkio.*"
-    if test -n "`$try 2> /dev/null`"; then
-      kde_lib_dir=$dir
-      break
+    if test -n "$KDEDIR"; then
+      kde_include_dirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_include_dirs"
+      kde_lib_dirs="$KDEDIR/lib $KDEDIR $kde_lib_dirs"
     fi
-  done
-
-  if test -n $kde_include_dir && test -n $kde_lib_dir; then
-    KIO_CFLAGS="-I$kde_include_dir -I$qt_include_dir"
-    KIO_LIBS="-L$KDE_PREFIX/lib -L$qt_lib_dir -lkio -lqt-mt"
-    AC_LANG_PUSH(C++)
-    save_LIBS="$LIBS"
-    save_CPPFLAGS="$CPPFLAGS"
-    LIBS="$LIBS $KIO_LIBS"
-    CPPFLAGS="$CPPFLAGS $KIO_CFLAGS"
-    AC_TRY_LINK([
+
+    for dir in $kde_include_dirs; do
+      if test -r "$dir/kglobal.h" && test -r "$dir/kdemacros.h"; then
+       kde_include_dir=$dir
+       break
+      fi
+    done
+
+    for dir in $kde_lib_dirs; do
+      try="ls -1 $dir/libkio.*"
+      if test -n "`$try 2> /dev/null`"; then
+       kde_lib_dir=$dir
+       break
+      fi
+    done
+
+    if test -n $kde_include_dir && test -n $kde_lib_dir; then
+      KIO_CFLAGS="-I$kde_include_dir -I$qt_include_dir"
+      KIO_LIBS="-L$KDE_PREFIX/lib -L$qt_lib_dir -lkio -lqt-mt"
+      AC_LANG_PUSH(C++)
+      save_LIBS="$LIBS"
+      save_CPPFLAGS="$CPPFLAGS"
+      LIBS="$LIBS $KIO_LIBS"
+      CPPFLAGS="$CPPFLAGS $KIO_CFLAGS"
+      AC_TRY_LINK([
 #include <kio/job.h>
-                ], [
-KIO::get ("bla")
-                ], HAVE_KIO="yes", HAVE_KIO="no")
-    LIBS="$save_LIBS"
-    CPPFLAGS="$save_CPPFLAGS"
-    AC_LANG_POP(C++)
-    AC_SUBST(KIO_CFLAGS)
-    AC_SUBST(KIO_LIBS)
-  else
-    HAVE_KIO="false"
+                  ], [
+  KIO::get ("bla")
+                  ], HAVE_KIO="yes", HAVE_KIO="no")
+      LIBS="$save_LIBS"
+      CPPFLAGS="$save_CPPFLAGS"
+      AC_LANG_POP(C++)
+      AC_SUBST(KIO_CFLAGS)
+      AC_SUBST(KIO_LIBS)
+    else
+      HAVE_KIO="false"
+    fi
   fi
 ])