redland/raptor/raptor-1.4.18.libxslt.patch

   1 --- misc/raptor-1.4.18/configure        2011-06-05 11:57:41.000000000 -0400
   2 +++ misc/build/raptor-1.4.18/configure  2011-06-05 11:58:11.000000000 -0400
   3 @@ -23470,73 +23470,6 @@
   4  LIBS="$oLIBS"
   5
   6
   7 -# Check whether --with-xslt-config was given.
   8 -if test "${with_xslt_config+set}" = set; then
   9 -  withval=$with_xslt_config; xslt_config="$withval"
  10 -else
  11 -  xslt_config=""
  12 -fi
  13 -
  14 -
  15 -if test "X$xslt_config" != "X" ; then
  16 -  { echo "$as_me:$LINENO: checking for $xslt_config" >&5
  17 -echo $ECHO_N "checking for $xslt_config... $ECHO_C" >&6; }
  18 -
  19 -  if test -f $xslt_config ; then
  20 -    XSLT_CONFIG=$xslt_config
  21 -    { echo "$as_me:$LINENO: result: yes" >&5
  22 -echo "${ECHO_T}yes" >&6; }
  23 -  else
  24 -    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
  25 -echo "${ECHO_T}no - searching PATH" >&6; }
  26 -  fi
  27 -fi
  28 -if test "X$XSLT_CONFIG" = "X"; then
  29 -  for ac_prog in xslt-config
  30 -do
  31 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
  32 -set dummy $ac_prog; ac_word=$2
  33 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  34 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  35 -if test "${ac_cv_prog_XSLT_CONFIG+set}" = set; then
  36 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  37 -else
  38 -  if test -n "$XSLT_CONFIG"; then
  39 -  ac_cv_prog_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test.
  40 -else
  41 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  42 -for as_dir in $PATH
  43 -do
  44 -  IFS=$as_save_IFS
  45 -  test -z "$as_dir" && as_dir=.
  46 -  for ac_exec_ext in '' $ac_executable_extensions; do
  47 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  48 -    ac_cv_prog_XSLT_CONFIG="$ac_prog"
  49 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  50 -    break 2
  51 -  fi
  52 -done
  53 -done
  54 -IFS=$as_save_IFS
  55 -
  56 -fi
  57 -fi
  58 -XSLT_CONFIG=$ac_cv_prog_XSLT_CONFIG
  59 -if test -n "$XSLT_CONFIG"; then
  60 -  { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
  61 -echo "${ECHO_T}$XSLT_CONFIG" >&6; }
  62 -else
  63 -  { echo "$as_me:$LINENO: result: no" >&5
  64 -echo "${ECHO_T}no" >&6; }
  65 -fi
  66 -
  67 -
  68 -  test -n "$XSLT_CONFIG" && break
  69 -done
  70 -
  71 -fi
  72 -
  73 -
  74  # Check whether --with-curl-config was given.
  75  if test "${with_curl_config+set}" = set; then
  76    withval=$with_curl_config; curl_config="$withval"
  77 @@ -24702,8 +24635,8 @@
  78
  79  oCPPFLAGS="$CPPFLAGS"
  80  oLIBS="$LIBS"
  81 -if test "X$XSLT_CONFIG" != X; then
  82 -  LIBS="$LIBS `$XSLT_CONFIG --libs`"
  83 +if test 0; then
  84 +  LIBS="$LIBS $LIBXSLT_LIBS"
  85    { echo "$as_me:$LINENO: checking for xsltSaveResultToString" >&5
  86  echo $ECHO_N "checking for xsltSaveResultToString... $ECHO_C" >&6; }
  87  if test "${ac_cv_func_xsltSaveResultToString+set}" = set; then
  88 @@ -24795,17 +24728,6 @@
  89  echo $ECHO_N "checking for system libxslt library... $ECHO_C" >&6; }
  90    if test $have_xsltSaveResultToString = yes; then
  91      have_libxslt=1
  92 -    CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
  93 -    LIBXSLT_VERSION=`$XSLT_CONFIG --version`
  94 -    libxslt_version_dec=`echo $LIBXSLT_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
  95 -    libxslt_min_version_dec=`echo $libxslt_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
  96 -    { echo "$as_me:$LINENO: result: yes - version $LIBXSLT_VERSION" >&5
  97 -echo "${ECHO_T}yes - version $LIBXSLT_VERSION" >&6; }
  98 -    if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
  99 -       { echo "$as_me:$LINENO: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&5
 100 -echo "$as_me: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&2;}
 101 -       have_libxslt=0
 102 -    fi
 103    else
 104      { echo "$as_me:$LINENO: result: no" >&5
 105  echo "${ECHO_T}no" >&6; }
 106 @@ -26395,8 +26317,8 @@
 107  fi
 108
 109  if test $need_libxslt = 1; then
 110 -  LIBS="$LIBS `$XSLT_CONFIG --libs`"
 111 -  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
 112 +  LIBS="$LIBS $LIBXSLT_LIBS"
 113 +  CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS"
 114  fi
 115
 116  RAPTOR_LIBTOOLLIBS=libraptor.la