patch for autoconf problems


Subject: patch for autoconf problems
From: Alec Wolman (wolman@cs.washington.edu)
Date: Sat Jun 02 2001 - 02:37:53 CDT


I am attempting to compile AbiWord on freebsd using the autoconf
framework. A number of the .m4 files have a bug that prevents
the configure script from running properly. The following patches
fix the problem.

Alec

--- abi-xml-parser.m4.orig Thu Apr 26 04:23:54 2001
+++ abi-xml-parser.m4 Sat Jun 2 00:27:55 2001
@@ -97,7 +97,7 @@
 fi
 
 if test "$abi_found_parser" = "no" ; then
- if test "x$1" != "x" -a -a "$1"; then
+ if test "x$1" != "x"; then
        # Use the expat sources given as an argument
        XML_LIBS="$1/lib/.libs/libexpat.a"
        XML_CFLAGS="-I $1/lib/"

--- abi-libpng.m4.orig Sat Apr 28 14:13:08 2001
+++ abi-libpng.m4 Sat Jun 2 00:30:07 2001
@@ -57,7 +57,7 @@
 # peer dir for abi ]
 
 if test "$abi_found_libpng" = "no"; then
- if test "x$1" != "x" -a -a "$1"; then
+ if test "x$1" != "x"; then
        LIBPNG_LIBS="$1/libpng.a"
        LIBPNG_CFLAGS="-I$1/"
        AC_MSG_RESULT(using supplied png library)

--- abi-wv.m4.orig Sat Apr 28 14:13:08 2001
+++ abi-wv.m4 Sat Jun 2 00:30:56 2001
@@ -57,7 +57,7 @@
 # peer dir for abi ]
 
 if test "$abi_found_wv" = "no"; then
- if test "x$1" != "x" -a -a "$1"; then
+ if test "x$1" != "x"; then
        WV_LIBS="$1/libwv.a"
        WV_CFLAGS="-I$1/"
        AC_MSG_RESULT(using supplied wv library)

--- abi-psiconv.m4.orig Sat Apr 28 14:13:08 2001
+++ abi-psiconv.m4 Sat Jun 2 00:31:41 2001
@@ -57,7 +57,7 @@
 # peer dir for abi ]
 
 if test "$abi_found_psiconv" = "no"; then
- if test "x$1" != "x" -a -a "$1"; then
+ if test "x$1" != "x"; then
        PSICONV_LIBS="$1/psiconv/.libs/libpsiconv.a"
        PSICONV_CFLAGS="-I$1/"
        AC_MSG_RESULT(using supplied psiconv library)



This archive was generated by hypermail 2b25 : Sat Jun 02 2001 - 02:38:10 CDT