Author: wiget Date: Thu Aug 17 18:41:27 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - allow Autoconf 2.60 - ask pkg-config for dbus location
---- Files affected: SOURCES: dbus-qt3-pkgconfig.patch (NONE -> 1.1) (NEW), dbus-qt3-ac260.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/dbus-qt3-pkgconfig.patch diff -u /dev/null SOURCES/dbus-qt3-pkgconfig.patch:1.1 --- /dev/null Thu Aug 17 20:41:27 2006 +++ SOURCES/dbus-qt3-pkgconfig.patch Thu Aug 17 20:41:22 2006 @@ -0,0 +1,41 @@ +--- dbus-1-qt3-0.2/configure.in.wiget 2006-08-17 20:27:46.000000000 +0200 ++++ dbus-1-qt3-0.2/configure.in 2006-08-17 20:30:52.000000000 +0200 +@@ -18,35 +18,10 @@ + + AC_MSG_CHECKING(for DBus) + +- dbus_inc=NOTFOUND +- dbus_lib=NOTFOUND +- dbus=NOTFOUND +- +- search_incs="/usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/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" +- 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 +- DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps" +- dbus_inc=FOUND +- fi +- +- search_libs="/usr/lib /usr/local/lib" +- AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) ++ DBUS_INCS="`pkg-config --cflags dbus-1`" ++ DBUS_LIBS="`pkg-config --libs dbus-1`" + +- if test -r $dbus_libdir/libdbus-1.so ; then +- DBUS_LIBS="-L$dbus_libdir -ldbus-1" +- dbus_lib=FOUND +- fi +- +- if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then +- AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps libraries $dbus_libdir) +- dbus=FOUND +- else +- AC_MSG_RESULT(searched but not found) +- fi ++ AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS) + + AC_SUBST(DBUS_INCS) + AC_SUBST(DBUS_LIBS) ================================================================ Index: SOURCES/dbus-qt3-ac260.patch diff -u /dev/null SOURCES/dbus-qt3-ac260.patch:1.1 --- /dev/null Thu Aug 17 20:41:27 2006 +++ SOURCES/dbus-qt3-ac260.patch Thu Aug 17 20:41:22 2006 @@ -0,0 +1,20 @@ +--- dbus-1-qt3-0.2/admin/cvs.sh.wigeta 2006-08-17 20:33:33.000000000 +0200 ++++ dbus-1-qt3-0.2/admin/cvs.sh 2006-08-17 20:34:23.000000000 +0200 +@@ -32,7 +32,7 @@ + required_autoconf_version="2.53 or newer" + AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` + case $AUTOCONF_VERSION in +- Autoconf*2.5* | autoconf*2.5* ) : ;; ++ Autoconf*2.[56]* | autoconf*2.[56]* ) : ;; + "" ) + echo "*** AUTOCONF NOT FOUND!." + echo "*** KDE requires autoconf $required_autoconf_version" +@@ -47,7 +47,7 @@ + + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` + case $AUTOHEADER_VERSION in +- Autoconf*2.5* | autoheader*2.5* ) : ;; ++ Autoconf*2.[56]* | autoheader*2.[56]* ) : ;; + "" ) + echo "*** AUTOHEADER NOT FOUND!." + echo "*** KDE requires autoheader $required_autoconf_version" ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
