redland/raptor/raptor-1.4.18.libxml.patch

   1 --- misc/raptor-1.4.18/configure        2011-06-05 11:55:18.000000000 -0400
   2 +++ misc/build/raptor-1.4.18/configure  2011-06-05 11:55:46.000000000 -0400
   3 @@ -23470,73 +23470,6 @@
   4  LIBS="$oLIBS"
   5
   6
   7 -# Check whether --with-xml2-config was given.
   8 -if test "${with_xml2_config+set}" = set; then
   9 -  withval=$with_xml2_config; xml2_config="$withval"
  10 -else
  11 -  xml2_config=""
  12 -fi
  13 -
  14 -
  15 -if test "X$xml2_config" != "X" ; then
  16 -  { echo "$as_me:$LINENO: checking for $xml2_config" >&5
  17 -echo $ECHO_N "checking for $xml2_config... $ECHO_C" >&6; }
  18 -
  19 -  if test -f $xml2_config ; then
  20 -    XML_CONFIG=$xml2_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$XML_CONFIG" = "X"; then
  29 -  for ac_prog in xml2-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_XML_CONFIG+set}" = set; then
  36 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  37 -else
  38 -  if test -n "$XML_CONFIG"; then
  39 -  ac_cv_prog_XML_CONFIG="$XML_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_XML_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 -XML_CONFIG=$ac_cv_prog_XML_CONFIG
  59 -if test -n "$XML_CONFIG"; then
  60 -  { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
  61 -echo "${ECHO_T}$XML_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 "$XML_CONFIG" && break
  69 -done
  70 -
  71 -fi
  72 -
  73 -
  74  # Check whether --with-xslt-config was given.
  75  if test "${with_xslt_config+set}" = set; then
  76    withval=$with_xslt_config; xslt_config="$withval"
  77 @@ -23719,8 +23652,8 @@
  78
  79  oCPPFLAGS="$CPPFLAGS"
  80  oLIBS="$LIBS"
  81 -if test "X$XML_CONFIG" != X; then
  82 -  LIBS="$LIBS `$XML_CONFIG --libs`"
  83 +if test 0; then
  84 +  LIBS="$LIBS $LIBXML_LIBS"
  85    { echo "$as_me:$LINENO: checking for xmlCreatePushParserCtxt" >&5
  86  echo $ECHO_N "checking for xmlCreatePushParserCtxt... $ECHO_C" >&6; }
  87  if test "${ac_cv_func_xmlCreatePushParserCtxt+set}" = set; then
  88 @@ -23813,18 +23746,6 @@
  89    if test $have_xmlCreatePushParserCtxt = yes; then
  90      have_libxml_lib=1
  91      have_libxml=1
  92 -    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
  93 -    LIBXML_VERSION=`$XML_CONFIG --version`
  94 -    libxml_version_dec=`echo $LIBXML_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
  95 -    libxml_min_version_dec=`echo $libxml_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
  96 -    { echo "$as_me:$LINENO: result: yes - version $LIBXML_VERSION" >&5
  97 -echo "${ECHO_T}yes - version $LIBXML_VERSION" >&6; }
  98 -    if test $libxml_version_dec -lt $libxml_min_version_dec; then
  99 -       { echo "$as_me:$LINENO: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&5
 100 -echo "$as_me: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&2;}
 101 -       have_libxml_lib=0
 102 -       have_libxml=0
 103 -    fi
 104    else
 105      { echo "$as_me:$LINENO: result: no" >&5
 106  echo "${ECHO_T}no" >&6; }
 107 @@ -26447,8 +26368,8 @@
 108      CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
 109      LIBS="$LIBS -Llibxml -llibxml"
 110    else
 111 -    LIBS="$LIBS `$XML_CONFIG --libs`"
 112 -    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
 113 +    LIBS="$LIBS $LIBXML_LIBS"
 114 +    CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
 115    fi
 116    RAPTOR_XML_PARSER=libxml
 117  fi