diff options
Diffstat (limited to 'editors/AbiWord2/files/patch-..::wv::configure')
| -rw-r--r-- | editors/AbiWord2/files/patch-..::wv::configure | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/editors/AbiWord2/files/patch-..::wv::configure b/editors/AbiWord2/files/patch-..::wv::configure index ade10754262f..b997602856e2 100644 --- a/editors/AbiWord2/files/patch-..::wv::configure +++ b/editors/AbiWord2/files/patch-..::wv::configure @@ -1,39 +1,39 @@ $FreeBSD$ ---- ../wv/configure.orig Tue Sep 18 20:24:33 2001 -+++ ../wv/configure Tue Oct 2 09:43:27 2001 -@@ -6008,7 +6008,7 @@ - # LIBXML2_LIBS="-lxml" ])) +--- ../wv/configure.orig Wed Oct 31 19:07:37 2001 ++++ ../wv/configure Fri Nov 23 16:22:12 2001 +@@ -2074,7 +2074,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. -set dummy glib-config; ac_word=$2 +set dummy glib12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:6014: checking for $ac_word" >&5 + echo "configure:2080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then -@@ -6586,16 +6586,16 @@ +@@ -2531,16 +2531,16 @@ if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:6592: checking for iconv.h" >&5 +-echo "configure:2537: checking for iconv.h" >&5 + ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:6592: checking for giconv.h" >&5 ++echo "configure:2537: checking for giconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF - #line 6597 "configure" + #line 2542 "configure" #include "confdefs.h" -#include <iconv.h> +#include <giconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6620,7 +6620,7 @@ + { (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -2565,7 +2565,7 @@ else echo "$ac_t""no" 1>&6 @@ -42,7 +42,7 @@ $FreeBSD$ fi -@@ -6635,30 +6635,30 @@ +@@ -2580,30 +2580,30 @@ if test "x$LIBICONV_DIR" != "x" ; then if test "$use_peer_libiconv" != "no" ; then ICONV_CFLAGS="-I$LIBICONV_DIR/include" @@ -65,50 +65,50 @@ $FreeBSD$ if test "$use_peer_libiconv" = "abi" ; then - ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:6655: checking for iconv.h" >&5 +-echo "configure:2600: checking for iconv.h" >&5 + ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:6655: checking for giconv.h" >&5 ++echo "configure:2600: checking for giconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF - #line 6660 "configure" + #line 2605 "configure" #include "confdefs.h" -#include <iconv.h> +#include <giconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6683,16 +6683,16 @@ + { (eval echo configure:2610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -2628,16 +2628,16 @@ fi else - ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 --echo "configure:6689: checking for iconv.h" >&5 +-echo "configure:2634: checking for iconv.h" >&5 + ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 -+echo "configure:6689: checking for giconv.h" >&5 ++echo "configure:2634: checking for giconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF - #line 6694 "configure" + #line 2639 "configure" #include "confdefs.h" -#include <iconv.h> +#include <giconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:6699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6712,14 +6712,14 @@ + { (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -2657,14 +2657,14 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:6717: checking for iconv_open in -liconv" >&5 +-echo "configure:2662: checking for iconv_open in -liconv" >&5 + echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:6717: checking for iconv_open in -lgiconv" >&5 ++echo "configure:2662: checking for iconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -117,16 +117,16 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 6725 "configure" + #line 2670 "configure" #include "confdefs.h" -@@ -6752,14 +6752,14 @@ +@@ -2697,14 +2697,14 @@ else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:6757: checking for libiconv_open in -liconv" >&5 +-echo "configure:2702: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:6757: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:2702: checking for libiconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -135,9 +135,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 6765 "configure" + #line 2710 "configure" #include "confdefs.h" -@@ -6792,7 +6792,7 @@ +@@ -2737,7 +2737,7 @@ else echo "$ac_t""no" 1>&6 @@ -146,8 +146,8 @@ $FreeBSD$ fi -@@ -6825,7 +6825,7 @@ - #line 6826 "configure" +@@ -2771,7 +2771,7 @@ + #line 2772 "configure" #include "confdefs.h" -#include <iconv.h> |