2006-02-16 Robert McQueen <robot101@debian.org>

	* configure.in: Patch from Debian packages by Sjoerd Simons
	<sjoerd@debian.org> to add --with-qt-moc and --with-qt3-moc
	arguments so it's possible to build both bindings in the
	same tree.

	* qt/Makefile.am: Fix truncated value so that make dist works.

diff --git a/ChangeLog b/ChangeLog
index 4f6a06271c8c3341977bf7849e1e6535beca7bbb..d9ab170e4d74bd26e45c464b2c1619d47c5960de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-16  Robert McQueen  <robot101@debian.org>
+
+       * configure.in: Patch from Debian packages by Sjoerd Simons
+       <sjoerd@debian.org> to add --with-qt-moc and --with-qt3-moc
+       arguments so it's possible to build both bindings in the
+       same tree.
+
+       * qt/Makefile.am: Fix truncated value so that make dist works.
+
 2006-02-16  Robert McQueen  <robot101@debian.org>
 
        * acinclude.m4, configure.in: Patch from Brad Hards

diff --git a/configure.in b/configure.in
index e9fe64f311b2bef72eb715975fcc888a2ddd2f25..6c85ed0267ce4fbe0087d4ba793b58c2065606a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,9 @@ AC_HEADER_STDC
 
 AC_ARG_ENABLE(qt, AS_HELP_STRING([--enable-qt],[enable Qt-friendly client library]),enable_qt=$enableval,enable_qt=auto)
 AC_ARG_ENABLE(qt-debug, AS_HELP_STRING([--enable-qt-debug],[enable Qt-friendly client library, linked to debug Qt libraries]),enable_qt_debug=$enableval,enable_qt_debug=no)
+AC_ARG_WITH(qt_moc, AS_HELP_STRING([--with-qt-moc=<path>],[moc for Qt]))
 AC_ARG_ENABLE(qt3, AS_HELP_STRING([--enable-qt3],[enable Qt3-friendly client library]),enable_qt3=$enableval,enable_qt3=auto)
+AC_ARG_WITH(qt3_moc, AS_HELP_STRING([--with-qt3-moc=<path>],[moc for Qt3]))
 AC_ARG_ENABLE(glib, AS_HELP_STRING([--enable-glib],[enable GLib-friendly client library]),enable_glib=$enableval,enable_glib=auto)
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable GTK-requiring executables]),enable_gtk=$enableval,enable_gtk=auto)
 AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
@@ -936,7 +938,12 @@ AC_SUBST(DBUS_GTK_THREADS_LIBS)
 
 
 dnl Qt3 detection
-AC_PATH_PROG(QT3_MOC, moc, no)
+if test -z "$with_qt3_moc" ; then
+  AC_PATH_PROG(QT3_MOC, moc, no)
+else
+  QT3_MOC=$with_qt3_moc
+  AC_SUBST(QT3_MOC)
+fi
 
 have_qt3=no
 AC_MSG_CHECKING([for qglobal.h])
@@ -1003,15 +1010,20 @@ PKG_CHECK_MODULES([DBUS_QT],
 dnl Check for moc too
 if test x$have_qt = xyes ; then
     AC_MSG_CHECKING([for moc])
-    QT_MOC=`$PKG_CONFIG --variable=exec_prefix $QT_CORE`
-    QT_MOC=${QT_MOC}/bin/moc
+
+    if test -z "$with_qt_moc" ; then
+        QT_MOC=`$PKG_CONFIG --variable=exec_prefix $QT_CORE`
+        QT_MOC=${QT_MOC}/bin/moc
+    else
+        QT_MOC=$with_qt_moc
+    fi
 
     if test -x "$QT_MOC"; then
         AC_MSG_RESULT([found, $QT_MOC])
     else
-       AC_MSG_RESULT([not found])
-       AC_MSG_WARN([moc not found; disabling Qt])
-       have_qt=no
+        AC_MSG_RESULT([not found])
+        AC_MSG_WARN([moc not found; disabling Qt])
+        have_qt=no
     fi
 fi
 

diff --git a/qt/Makefile.am b/qt/Makefile.am
index 9117d27eafc3b77bc84800bb6241c1e67c9b4d82..97be5b00eace83d2a7338afe7a6c90c506c3246e 100644 (file)
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -52,7 +52,7 @@ libdbus_qt4_1_la_SOURCES =                    \
        $(top_srcdir)/qt/qdbusobject.h          \
        $(top_srcdir)/qt/qdbusobject_p.h        \
        $(top_srcdir)/qt/qdbusserver.h          \
-       $(top_srcdir)/qt/qdbusstandardinterfaces.
+       $(top_srcdir)/qt/qdbusstandardinterfaces.h \
        $(top_srcdir)/qt/qdbustype.h            \
        $(top_srcdir)/qt/qdbusvariant.h         \
        $(top_srcdir)/qt/qdbusxmlparser_p.h