Modified patch with kde4 support.

kde4-configure.diff (text/plain), 8.71 KB, created by Martin Samek on 2009-08-06 16:49:44 UTC

diff --git configure.in configure.in
index d2d8406..3a878bb 100644
--- configure.in
+++ configure.in
@@ -269,6 +269,11 @@ AC_ARG_ENABLE(kde,
 AC_ARG_ENABLE(kdeab,
 [  --disable-kdeab         Disable the KDE address book support
 ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+AC_ARG_ENABLE(kde4,
+[  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
+                          where Qt4 and KDE4 are available. May be used with --enable-kde 
+                          if you want to support both KDE3 and KDE4.
+],,)
 AC_ARG_ENABLE(binfilter,
 [  --disable-binfilter     Disable legacy binary file formats filters
 ],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
@@ -912,6 +916,7 @@ case "$build_os" in
 		test_cairo=yes
 		build_gstreamer=yes
 		test_kde=yes
+		test_kde4=yes
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
@@ -941,6 +946,7 @@ case "$build_os" in
 		test_cairo=yes
 		build_gstreamer=yes
 		test_kde=yes
+		test_kde4=yes
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
@@ -985,6 +991,7 @@ case "$build_os" in
 		test_cairo=yes
 		build_gstreamer=yes
 		test_kde=yes
+		test_kde4=yes
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
@@ -1019,6 +1026,7 @@ case "$build_os" in
 		test_cairo=yes
 		build_gstreamer=yes
 		test_kde=yes
+		test_kde4=yes
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
@@ -5447,6 +5455,13 @@ if test "x$enable_kde" = "xyes"; then
 fi
 AC_SUBST(ENABLE_KDE)
 
+ENABLE_KDE4=""
+if test "x$enable_kde4" = "xyes"; then
+    ENABLE_KDE4="TRUE"
+    R="$R kde4"
+fi
+AC_SUBST(ENABLE_KDE4)
+
 if test -z "$R"; then
 	AC_MSG_RESULT([none])
 else
@@ -6018,11 +6033,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
         fi
     fi
     if test "$build_cpu" != "x86_64" ; then
-        kde_incdirs="/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 $x_includes"
-        kde_libdirs="/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 $x_libraries"
+        kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+        kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
     else
-        kde_incdirs="/usr/lib64/kde/include /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 $x_includes"
-        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /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 $x_libraries"
+        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /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 /usr/lib64 $x_libraries"
     fi
     if test -n "$KDEDIR" ; then
         kde_incdirs="$KDEDIR/include $kde_incdirs"
@@ -6069,12 +6084,13 @@ your Qt installation by exporting QTDIR before running "configure".])
 your Qt installation by exporting QTDIR before running "configure".])
     fi
 
+    dnl Check for Meta Object Compiler
     AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
     if test "$MOC" = "no" ; then
         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QTDIR before running "configure".])
-     fi
-     
+    fi
+
     dnl Check for KDE headers
     AC_MSG_CHECKING([for KDE headers])
     kde_incdir="no"
@@ -6114,6 +6130,102 @@ AC_SUBST(KDE_LIBS)
 AC_SUBST(MOC)
 
 dnl ===================================================================
+dnl KDE4 Integration
+dnl ===================================================================
+
+KDE4_CFLAGS=""
+KDE4_LIBS=""
+MOC4="moc"
+if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+   qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries"
+   
+   kde_incdirs="/usr/include $x_includes"
+   kde_libdirs="/usr/lib $x_libraries"
+   
+   if test "$build_cpu" == "x86_64" ; then
+      qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
+      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+   fi
+
+   qt_test_include="Qt/qobject.h"
+   qt_test_library="libQtCore.so"
+   kde_test_include="ksharedptr.h"
+   kde_test_library="libkdeui.so"
+   
+   AC_MSG_CHECKING([for Qt4 headers])
+   qt_header_dir="no"
+   for inc_dir in $qt_incdirs ; do
+      if test -r "$inc_dir/$qt_test_include" ; then
+         qt_header_dir="$inc_dir"
+         break
+      fi
+   done
+   
+   AC_MSG_RESULT([$qt_header_dir])
+   if test "x$qt_header_dir" = "xno" ; then
+      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+   fi
+   
+   AC_MSG_CHECKING([for Qt4 libraries])
+   qt_lib_dir="no"
+   for lib_dir in $qt_libdirs ; do
+      if test -r "$lib_dir/$qt_test_library" ; then
+         qt_lib_dir="$lib_dir"
+         break
+      fi
+   done
+   
+   AC_MSG_RESULT([$qt_lib_dir])
+   
+   if test "x$qt_lib_dir" = "xno" ; then
+      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+   fi
+
+   dnl Check for Meta Object Compiler
+   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
+   if test "$MOC4" = "no" ; then
+      AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+the root of your Qt installation by exporting QTDIR before running "configure".])
+   fi
+
+   dnl Check for KDE4 headers
+   AC_MSG_CHECKING([for KDE4 headers])
+   kde_incdir="no"
+   for kde_check in $kde_incdirs ; do
+      if test -r "$kde_check/$kde_test_include" ; then
+         kde_incdir="$kde_check"
+         break
+      fi
+   done
+   AC_MSG_RESULT([$kde_incdir])
+   if test "x$kde_incdir" = "xno" ; then
+      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+   fi
+
+   dnl Check for KDE4 libraries
+   AC_MSG_CHECKING([for KDE4 libraries])
+   kde_libdir="no"
+   for kde_check in $kde_libdirs ; do
+      if test -r "$kde_check/$kde_test_library" ; then
+         kde_libdir="$kde_check"
+         break
+      fi
+   done
+   
+   AC_MSG_RESULT([$kde_libdir])
+   if test "x$kde_libdir" = "xno" ; then
+      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+   fi
+
+   KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+   KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+fi
+AC_SUBST(KDE4_CFLAGS)
+AC_SUBST(KDE4_LIBS)
+AC_SUBST(MOC4)
+
+dnl ===================================================================
 dnl Test for the enabling the lockdown pieces
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable the lockdown pieces])
diff --git set_soenv.in set_soenv.in
index 9bc71be..e3bc624 100644
--- set_soenv.in
+++ set_soenv.in
@@ -1757,8 +1757,12 @@ ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
 ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
 ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
 ToFile( "KDE_LIBS",          "@KDE_LIBS@",         "e" );
-ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "MOC",               "@MOC@",              "e" );
+ToFile( "ENABLE_KDE4",       "@ENABLE_KDE4@",      "e" );
+ToFile( "KDE4_CFLAGS",       "@KDE4_CFLAGS@",      "e" );
+ToFile( "KDE4_LIBS",         "@KDE4_LIBS@",        "e" );
+ToFile( "MOC4",              "@MOC4@",             "e" );
+ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
 #