SOURCES: dbus-qt3-configure.patch - up to 0.8.1

arvenil arvenil at pld-linux.org
Sat Jan 26 18:05:25 CET 2008


Author: arvenil                      Date: Sat Jan 26 17:05:25 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.8.1

---- Files affected:
SOURCES:
   dbus-qt3-configure.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/dbus-qt3-configure.patch
diff -u SOURCES/dbus-qt3-configure.patch:1.1 SOURCES/dbus-qt3-configure.patch:1.2
--- SOURCES/dbus-qt3-configure.patch:1.1	Thu Aug 17 20:36:10 2006
+++ SOURCES/dbus-qt3-configure.patch	Sat Jan 26 18:05:20 2008
@@ -1,25 +1,24 @@
-diff -aurN dbus-1-qt3-0.2.orig/configure.in dbus-1-qt3-0.2/configure.in
---- dbus-1-qt3-0.2.orig/configure.in	2006-01-22 23:58:18.000000000 +0100
-+++ dbus-1-qt3-0.2/configure.in	2006-08-17 20:28:16.000000000 +0200
-@@ -22,10 +22,10 @@
-   dbus_lib=NOTFOUND
-   dbus=NOTFOUND
+--- libdbus-1-qt3-0.8.1/configure.in	2007-12-17 11:34:08.000000000 +0000
++++ libdbus-1-qt3-0.8.1/configure.in	2008-01-26 15:48:40.000000000 +0000
+@@ -27,10 +27,10 @@
+   KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
  
--  search_incs="/usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  search_incs="/usr/include /usr/include/dbus-1.0"
-   AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
+   if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
+-    search_incs="/usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
++    search_incs="/usr/include /usr/include/dbus-1.0"
+     AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
  
--  search_incs_arch_deps="/usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include"
-+  search_incs_arch_deps="${libdir}/dbus-1.0/include"
-   AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
+-    search_incs_arch_deps="/usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include"
++    search_incs_arch_deps="${libdir}/dbus-1.0/include"
+     AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
  
-   if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
-@@ -33,7 +33,7 @@
-     dbus_inc=FOUND
-   fi
+     if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
+@@ -38,7 +38,7 @@
+       dbus_inc=FOUND
+     fi
  
--  search_libs="/usr/lib /usr/local/lib"
-+  search_libs="${libdir}"
-   AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
+-    search_libs="/lib /usr/lib /usr/local/lib"
++    search_libs="${libdir}"
+     AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
  
-   if test -r $dbus_libdir/libdbus-1.so ; then
+     if test -r $dbus_libdir/libdbus-1.so ; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dbus-qt3-configure.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list