diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix trouble with raptor

Browse Source
This commit is contained in:
Vitor Santos Costa
2015-01-06 17:47:12 +00:00
parent f42f2ff57d
commit de9a1d7429
1 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
configure vendored
View File

@@ -15118,29 +15118,33 @@ else
fi fi
if test "$yap_cv_raptor" != no;
if test "$yap_cv_raptor" = no;
then then
PKG_RAPTOR=""
else
old_inc="$CPPFLAGS"
old_libs="$LIBS"
if test "$yap_cv_raptor" != "NONE" -a "$yap_cv_raptor" != "yes"; then
old_inc="$CPPFLAGS"
old_libs="$LIBS"
if test "$yap_cv_raptor" != "NONE" -a "$yap_cv_raptor" != "yes"; then
RAPTOR_CPPFLAGS="-I $yap_cv_raptor/include" RAPTOR_CPPFLAGS="-I $yap_cv_raptor/include"
raptor_dir="$yap_cv_raptor" raptor_dir="$yap_cv_raptor"
elif test "$prefix" != "NONE"; then elif test "$prefix" != "NONE"; then
RAPTOR_CPPFLAGS="-I $prefix/include" RAPTOR_CPPFLAGS="-I $prefix/include"
raptor_dir="$prefix" raptor_dir="$prefix"
else else
RAPTOR_CPPFLAGS="-I /usr/local/include" RAPTOR_CPPFLAGS="-I /usr/local/include"
raptor_dir=/usr/local raptor_dir=/usr/local
fi fi
CPPFLAGS="$CPPFLAGS $RAPTOR_CPPFLAGS" CPPFLAGS="$CPPFLAGS $RAPTOR_CPPFLAGS"
for ac_header in raptor2/raptor2.h for ac_header in raptor2/raptor2.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "raptor2/raptor2.h" "ac_cv_header_raptor2_raptor2_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "raptor2/raptor2.h" "ac_cv_header_raptor2_raptor2_h" "$ac_includes_default"
if test "x$ac_cv_header_raptor2_raptor2_h" = xyes; then : if test "x$ac_cv_header_raptor2_raptor2_h" = xyes; then :
@@ -15152,7 +15156,7 @@ fi
done done
for ac_header in raptor.h for ac_header in raptor.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "raptor.h" "ac_cv_header_raptor_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "raptor.h" "ac_cv_header_raptor_h" "$ac_includes_default"
if test "x$ac_cv_header_raptor_h" = xyes; then : if test "x$ac_cv_header_raptor_h" = xyes; then :
@@ -15166,17 +15170,17 @@ done
if test -d "$raptor_dir/lib64/raptor" -a "$YAP_TARGET" = amd64; then if test -d "$raptor_dir/lib64/raptor" -a "$YAP_TARGET" = amd64; then
LIBS="-L $raptor_dir/lib64/raptor" LIBS="-L $raptor_dir/lib64/raptor"
elif test -d "$raptor_dir/lib64" -a "$YAP_TARGET" = amd64; then elif test -d "$raptor_dir/lib64" -a "$YAP_TARGET" = amd64; then
LIBS="$LIBS -L $raptor_dir/lib64 -L $raptor_dir/lib " LIBS="$LIBS -L $raptor_dir/lib64 -L $raptor_dir/lib "
elif test -d "$raptor_dir/lib/raptor"; then elif test -d "$raptor_dir/lib/raptor"; then
LIBS="$LIBS -L $raptor_dir/lib/raptor" LIBS="$LIBS -L $raptor_dir/lib/raptor"
elif test -d "$raptor_dir/lib"; then elif test -d "$raptor_dir/lib"; then
LIBS="$LIBS -L $raptor_dir/lib" LIBS="$LIBS -L $raptor_dir/lib"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor_world_open in -lraptor2" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor_world_open in -lraptor2" >&5
$as_echo_n "checking for raptor_world_open in -lraptor2... " >&6; } $as_echo_n "checking for raptor_world_open in -lraptor2... " >&6; }
if ${ac_cv_lib_raptor2_raptor_world_open+:} false; then : if ${ac_cv_lib_raptor2_raptor_world_open+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@@ -15271,10 +15275,10 @@ fi
fi fi
RAPTOR_LIBS="$LIBS" RAPTOR_LIBS="$LIBS"
if test "$raptor_available" = no if test "$raptor_available" = no
then then
PKG_RAPTOR="" PKG_RAPTOR=""
cat << EOF cat << EOF
################################################################## ##################################################################
@@ -15287,8 +15291,8 @@ else
fi fi
CPPFLAGS="$old_inc" CPPFLAGS="$old_inc"
LIBS="$oldlibs" LIBS="$oldlibs"
fi fi