summaryrefslogtreecommitdiff
path: root/external/redland/rasqal/rasqal-pkgconfig.patch.1
diff options
context:
space:
mode:
Diffstat (limited to 'external/redland/rasqal/rasqal-pkgconfig.patch.1')
-rw-r--r--external/redland/rasqal/rasqal-pkgconfig.patch.1518
1 files changed, 10 insertions, 508 deletions
diff --git a/external/redland/rasqal/rasqal-pkgconfig.patch.1 b/external/redland/rasqal/rasqal-pkgconfig.patch.1
index 154b1e6b9d77..ac3eab07c4e4 100644
--- a/external/redland/rasqal/rasqal-pkgconfig.patch.1
+++ b/external/redland/rasqal/rasqal-pkgconfig.patch.1
@@ -1,512 +1,14 @@
Let the pkg-config stuff be overridden by variables
---- a/configure.ac 2013-03-29 23:57:59.782772145 +0100
-+++ b/configure.ac 2013-03-30 00:09:41.823766113 +0100
-@@ -394,25 +394,15 @@
- RAPTOR_MIN_VERSION=2.0.7
+--- a/configure
++++ b/configure
+@@ -14119,7 +14119,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
-
--AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
--if test "X$PKG_CONFIG" = X; then
-- AC_MSG_ERROR(pkg-config not found. configuring raptor V2 requires it. Get it from http://pkg-config.freedesktop.org/)
--fi
-+PKG_PROG_PKG_CONFIG
-
--AC_MSG_CHECKING(for raptor)
--if $PKG_CONFIG raptor2 --exists; then
-+PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= $RAPTOR_MIN_VERSION],[
- RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
-- AC_MSG_RESULT(system $RAPTOR_VERSION)
--
-- if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
-- :
-- else
-- AC_MSG_ERROR(Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION)
-- fi
--else
-- AC_MSG_RESULT(not found)
-+],[
- AC_MSG_ERROR(Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
--fi
-+])
-+AC_SUBST(RAPTOR2_CFLAGS)
-+AC_SUBST(RAPTOR2_LIBS)
-
- RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
- AC_SUBST(RAPTOR_VERSION_DEC)
-@@ -879,8 +867,8 @@
-
-
-
--RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
--RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
-+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
-+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
- RAPPER_PATH=""
-
- if test $need_regex_pcre = 1; then
---- a/configure 2013-03-31 00:36:31.396795267 +0100
-+++ b/configure 2013-03-31 00:36:42.820795169 +0100
-@@ -652,8 +652,6 @@
- GTKDOC_MKPDF
- GTKDOC_REBASE
- GTKDOC_CHECK
--PKG_CONFIG_LIBDIR
--PKG_CONFIG_PATH
- AM_BACKSLASH
- AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V
-@@ -687,6 +685,10 @@
- PCRE_CONFIG
- RAPTOR_MIN_VERSION
- RAPTOR_VERSION_DEC
-+RAPTOR2_LIBS
-+RAPTOR2_CFLAGS
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
- PKG_CONFIG
- GETTIMEOFDAY_FALSE
- GETTIMEOFDAY_TRUE
-@@ -872,6 +874,8 @@
- PKG_CONFIG
- PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
-+RAPTOR2_CFLAGS
-+RAPTOR2_LIBS
- GTKDOC_DEPS_CFLAGS
- GTKDOC_DEPS_LIBS'
-
-@@ -1554,6 +1558,10 @@
- directories to add to pkg-config's search path
- PKG_CONFIG_LIBDIR
- path overriding pkg-config's built-in search path
-+ RAPTOR2_CFLAGS
-+ C compiler flags for RAPTOR2, overriding pkg-config
-+ RAPTOR2_LIBS
-+ linker flags for RAPTOR2, overriding pkg-config
- GTKDOC_DEPS_CFLAGS
- C compiler flags for GTKDOC_DEPS, overriding pkg-config
- GTKDOC_DEPS_LIBS
-@@ -13818,26 +13826,35 @@
- RAPTOR_MIN_VERSION=2.0.7
-
-
--for ac_prog in pkg-config
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
-+
-+
-+
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test -n "$PKG_CONFIG"; then
-- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_PKG_CONFIG="$ac_prog"
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -13845,9 +13862,10 @@
- done
- IFS=$as_save_IFS
-
-+ ;;
-+esac
- fi
--fi
--PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
-@@ -13857,31 +13875,158 @@
- fi
-
-
-- test -n "$PKG_CONFIG" && break
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ ac_pt_PKG_CONFIG=$PKG_CONFIG
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
- done
-+ done
-+IFS=$as_save_IFS
-
--if test "X$PKG_CONFIG" = X; then
-- as_fn_error $? "pkg-config not found. configuring raptor V2 requires it. Get it from http://pkg-config.freedesktop.org/" "$LINENO" 5
-+ ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor" >&5
--$as_echo_n "checking for raptor... " >&6; }
--if $PKG_CONFIG raptor2 --exists; then
- RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: system $RAPTOR_VERSION" >&5
--$as_echo "system $RAPTOR_VERSION" >&6; }
--
-- if $PKG_CONFIG raptor2 --atleast-version=$RAPTOR_MIN_VERSION; then
-- :
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
- else
-- as_fn_error $? "Installed raptor $RAPTOR_VERSION is too old - need $RAPTOR_MIN_VERSION" "$LINENO" 5
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ PKG_CONFIG=""
-+ fi
-+fi
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAPTOR2" >&5
-+$as_echo_n "checking for RAPTOR2... " >&6; }
-+
-+if test -n "$RAPTOR2_CFLAGS"; then
-+ pkg_cv_RAPTOR2_CFLAGS="$RAPTOR2_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_RAPTOR2_CFLAGS=`$PKG_CONFIG --cflags "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$RAPTOR2_LIBS"; then
-+ pkg_cv_RAPTOR2_LIBS="$RAPTOR2_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"raptor2 >= \$RAPTOR_MIN_VERSION\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "raptor2 >= $RAPTOR_MIN_VERSION") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_RAPTOR2_LIBS=`$PKG_CONFIG --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
-+ else
-+ RAPTOR2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "raptor2 >= $RAPTOR_MIN_VERSION" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$RAPTOR2_PKG_ERRORS" >&5
-+
-+
-+ as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
-+
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
- as_fn_error $? "Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION" "$LINENO" 5
-+
-+else
-+ RAPTOR2_CFLAGS=$pkg_cv_RAPTOR2_CFLAGS
-+ RAPTOR2_LIBS=$pkg_cv_RAPTOR2_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+ RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
-+
- fi
-
-+
-+
- RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-
-
-@@ -14883,8 +15028,8 @@
-
-
-
--RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
--RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
-+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS $RAPTOR2_CFLAGS"
-+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS $RAPTOR2_LIBS"
- RAPPER_PATH=""
-
- if test $need_regex_pcre = 1; then
-@@ -15579,126 +15724,6 @@
-
-
-
--
--
--
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_PKG_CONFIG+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
-- ac_pt_PKG_CONFIG=$PKG_CONFIG
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- case $ac_pt_PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- if test "x$ac_pt_PKG_CONFIG" = x; then
-- PKG_CONFIG=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
-- PKG_CONFIG=$ac_pt_PKG_CONFIG
-- fi
--else
-- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
-- _pkg_min_version=0.9.0
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
--$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- PKG_CONFIG=""
-- fi
--fi
--
--
--
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
---- a/utils/Makefile.am 2013-03-31 00:39:54.396793523 +0100
-+++ b/utils/Makefile.am 2013-03-31 00:34:47.293796162 +0100
-@@ -37,22 +37,22 @@
- roqet_SOURCES += getopt.c rasqal_getopt.h
- endif
- roqet_LDADD = $(top_builddir)/src/librasqal.la
--roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+roqet_LDFLAGS = @RAPTOR2_LIBS@
-
- check_query_SOURCES = check_query.c
- if GETOPT
- check_query_SOURCES += getopt.c rasqal_getopt.h
- endif
- check_query_LDADD = $(top_builddir)/src/librasqal.la
--check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+check_query_LDFLAGS = @RAPTOR2_LIBS@
-
- srxread_SOURCES = srxread.c
- srxread_LDADD = $(top_builddir)/src/librasqal.la
--srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxread_LDFLAGS = @RAPTOR2_LIBS@
-
- srxwrite_SOURCES = srxwrite.c
- srxwrite_LDADD = $(top_builddir)/src/librasqal.la
--srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
-
- EXTRA_DIST= \
- $(man_MANS) \
---- a/utils/Makefile.in 2013-03-31 00:40:02.603793453 +0100
-+++ b/utils/Makefile.in 2013-03-31 00:35:44.498795670 +0100
-@@ -359,16 +359,16 @@
- AM_CFLAGS = $(MEM)
- roqet_SOURCES = roqet.c $(am__append_1)
- roqet_LDADD = $(top_builddir)/src/librasqal.la
--roqet_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+roqet_LDFLAGS = @RAPTOR2_LIBS@
- check_query_SOURCES = check_query.c $(am__append_2)
- check_query_LDADD = $(top_builddir)/src/librasqal.la
--check_query_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+check_query_LDFLAGS = @RAPTOR2_LIBS@
- srxread_SOURCES = srxread.c
- srxread_LDADD = $(top_builddir)/src/librasqal.la
--srxread_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxread_LDFLAGS = @RAPTOR2_LIBS@
- srxwrite_SOURCES = srxwrite.c
- srxwrite_LDADD = $(top_builddir)/src/librasqal.la
--srxwrite_LDFLAGS = `$(PKG_CONFIG) raptor2 --libs`
-+srxwrite_LDFLAGS = @RAPTOR2_LIBS@
- EXTRA_DIST = \
- $(man_MANS) \
- roqet.html
++ RAPTOR_VERSION=2.0.15
+ raptor_too_old=0
+ as_arg_v1=$RAPTOR_VERSION
+ as_arg_v2=$RAPTOR_MIN_VERSION
+