You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
214 lines
7.1 KiB
214 lines
7.1 KiB
diff -Nru kdebluetooth-1.0_beta1.orig/configure.in kdebluetooth-1.0_beta1/configure.in
|
|
--- kdebluetooth-1.0_beta1.orig/configure.in 2005-03-20 18:46:50.000000000 +0200
|
|
+++ kdebluetooth-1.0_beta1/configure.in 2006-04-23 20:42:41.850121250 +0300
|
|
@@ -200,75 +200,7 @@
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-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
|
|
-
|
|
-
|
|
-AC_SUBST(OPENOBEX_CFLAGS)
|
|
-AC_SUBST(OPENOBEX_LIBS)
|
|
-AC_MSG_RESULT(yes)
|
|
+AM_PATH_OPENOBEX(1.0.0)
|
|
|
|
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
|
|
|
|
@@ -519,14 +451,6 @@
|
|
echo ""
|
|
fi
|
|
|
|
-if test "$obex_config_version_ok" != "yes" ; then
|
|
- echo ""
|
|
- echo "The installed openobex library version is too old: ($obex_config_version)"
|
|
- echo "Kdebluetooth won't be compiled without a newer version, so you should"
|
|
- echo "consider updating it."
|
|
- echo ""
|
|
-fi
|
|
-
|
|
|
|
|
|
|
|
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h
|
|
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h 2005-03-20 18:46:48.000000000 +0200
|
|
+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h 2006-04-23 20:58:31.657480500 +0300
|
|
@@ -30,7 +30,7 @@
|
|
{
|
|
#include <sys/socket.h>
|
|
#include <bluetooth/bluetooth.h>
|
|
-#include <obex.h>
|
|
+#include <openobex/obex.h>
|
|
}
|
|
|
|
extern "C" void Obex_handleEvent(obex_t *, obex_object_t *, int, int, int, int);
|
|
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h
|
|
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h 2005-03-20 18:46:48.000000000 +0200
|
|
+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h 2006-04-23 20:58:43.326209750 +0300
|
|
@@ -20,7 +20,7 @@
|
|
#define KOBEXHEADER_H
|
|
|
|
extern "C" {
|
|
- #include <obex.h>
|
|
+ #include <openobex/obex.h>
|
|
}
|
|
|
|
class ObexObject;
|
|
diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in
|
|
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in 2006-06-30 14:03:45.000000000 +0200
|
|
+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in 2006-06-30 14:04:58.000000000 +0200
|
|
@@ -127,74 +127,7 @@
|
|
|
|
|
|
|
|
-
|
|
-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
|
|
-
|
|
-
|
|
-AC_SUBST(OPENOBEX_CFLAGS)
|
|
-AC_SUBST(OPENOBEX_LIBS)
|
|
-AC_MSG_RESULT(yes)
|
|
+AM_PATH_OPENOBEX(1.0.0)
|
|
|
|
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
|
|
|
|
--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.bot 2006-06-30 14:12:01.000000000 +0200
|
|
+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.bot 2006-06-30 14:12:11.000000000 +0200
|
|
@@ -26,13 +26,6 @@
|
|
echo ""
|
|
fi
|
|
|
|
-if test "$obex_config_version_ok" != "yes" ; then
|
|
- echo ""
|
|
- echo "The installed openobex library version is too old: ($obex_config_version)"
|
|
- echo "Kdebluetooth won't be compiled without a newer version, so you should"
|
|
- echo "consider updating it."
|
|
- echo ""
|
|
-fi
|
|
|
|
|
|
|