SOURCES: kdebluetooth-openobex.patch (NEW) - new

[arekm]

Author: arekm                        Date: Sun Sep 10 10:07:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   kdebluetooth-openobex.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kdebluetooth-openobex.patch
diff -u /dev/null SOURCES/kdebluetooth-openobex.patch:1.1
--- /dev/null	Sun Sep 10 12:07:51 2006
+++ SOURCES/kdebluetooth-openobex.patch	Sun Sep 10 12:07:46 2006
@@ -0,0 +1,76 @@
+diff -urN kdebluetooth-1.0_beta1.org/kdebluetooth/configure.in.in kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in
+--- kdebluetooth-1.0_beta1.org/kdebluetooth/configure.in.in	2005-03-20 16:46:48.000000000 +0000
++++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in	2006-09-10 10:05:50.342457250 +0000
+@@ -131,70 +131,11 @@
+ dnl Check for openobex library
+ # Modified by Simone Gotti for kde-bluetooth on 2003-10-04
+ 
+-AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
+-
+-if test "$OPENOBEX_CONFIG" = "no" ; then
+-	AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.)
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-	OPENOBEX_CONFIG="false"
+-fi
+-
+-OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
+-openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
+-if test -f "$openobex_inc_dir/obex.h" ; then
+-    :
+-else
+-    if test -f "$openobex_inc_dir/openobex/obex.h" ; then
+-        OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
+-    else
+-        DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-    fi
+-fi
+-OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
+-
+-min_obex_version=1.0.0
+-AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
+-obex_config_version=`$OPENOBEX_CONFIG --version`
+-
+-obex_config_major_version=`$OPENOBEX_CONFIG --version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-obex_req_major_version=`echo $min_obex_version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-obex_req_minor_version=`echo $min_obex_version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-obex_req_micro_version=`echo $min_obex_version | \
+-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then
+-	if test $obex_req_major_version -lt $obex_config_major_version ; then
+-		obex_config_version_ok="yes"
+-	fi
+-	if test $obex_req_major_version -eq $obex_config_major_version ; then
+-		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
+-			obex_config_version_ok="yes"
+-   		fi
+-		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
+-			if test $obex_req_micro_version -le $obex_config_micro_version ; then
+-				obex_config_version_ok="yes"
+-			fi
+-		fi
+-	fi
+-fi
+-
+-if test "$obex_config_version_ok" != "yes" ; then
+-	AC_MSG_WARN(Installed openobex library too old ($obex_config_version))
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-fi
+-
++OPENOBEX_CFLAGS=`pkg-config openobex --cflags`
++OPENOBEX_LIBS=`pkg-config openobex --libs`
+ 
+ AC_SUBST(OPENOBEX_CFLAGS)
+ AC_SUBST(OPENOBEX_LIBS)
+-AC_MSG_RESULT(yes)
+ 
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ 
================================================================