Subject: [PATCH] Fixing wv's configure.in
From: Diego Sueiro (dhsueiro@yahoo.com)
Date: Mon Jan 15 2001 - 21:17:01 CST
I'm trying to compile Abiword with Slackware 7.0 on an x86.
While doing so, I've found some problems with compiling wv
from the tarball provided at Abiword ftp. As I'm not sure
whether wv mantainer is aware of this distribution ( though I
think he's in this list ) I'm cc him.
I fixed configure.in to:
1) Allow gdwmf support ( there were some problems with xpm tests
that seem to be wrong and with compile directives for compiling
X programs ).
2) Codepages tests weren't prepared for compiling against libiconv (
I guess those tests only worked in those boxes where incov is part of
glibc ).
As I think this tarball is older than current cvs, I've diff-ed the
configure.in provided in the tarball against the one tweaked by me.
Don't know if those changes are completly right ( I'm not too versed
in autoconf myself ). At least they work for me :).
--- configure.in.old Mon Jan 15 23:58:48 2001
+++ configure.in Mon Jan 15 23:59:46 2001
@@ -231,7 +231,7 @@
XPMINCLUDE="<X11/xpm.h>"
], no_sys_xpm=yes)
-if test "x$no_sys_xpm" != "xno"; then
+if test "x$no_sys_xpm" = "xno"; then
AC_CHECK_HEADER(xpm.h, [
AC_DEFINE(HAVE_XPM)
HAVE_XPM=1
@@ -243,7 +243,7 @@
fi
dnl I dumbly assume that if they have the header, they have the lib
-if test "x$no_sys_xpm" = "xno"; then
+if test "x$no_sys_xpm" != "xno"; then
if test "x$XPM_DIR" != "x"; then
XPM_LIBS="-L$XPM_DIR/lib -lXpm"
else
@@ -311,6 +311,9 @@
fi
])
+CPPFLAGS="${CPPGLAGS} $X_CFLAGS"
+LDFLAGS="${LDFLAGS} $X_LDFLAGS $X_LIBS"
+
AC_CHECK_HEADER(gdwmfapi.h,
AC_CHECK_LIB(gdwmf, gd_draw_rectangle,[
AC_DEFINE(HAVE_WMF)
@@ -333,6 +336,8 @@
AC_MSG_CHECKING([for existance of $1 to $2 iconv support])
dnl AC_CACHE_VAL(have_codepages,
dnl [
+ac_save_LIBS="$LIBS"
+LIBS="$LIBS $ICONV_LIBS"
AC_TRY_RUN([
#include <iconv.h>
#include <stdio.h>
@@ -379,6 +384,7 @@
], have_codepages=yes, have_codepages=no, have_codepages=no)
dnl])
AC_MSG_RESULT($have_codepages)
+LIBS="$ac_save_LIBS"
if test $have_codepages = no; then
AC_DEFINE(MUST_USE_INTERNAL_ICONV_TABLE)
ICONVOBJS="\$(RICONVOBJS)"
__________________________________________________
Do You Yahoo!?
Talk to your friends online with Yahoo! Messenger.
http://im.yahoo.com
This archive was generated by hypermail 2b25 : Mon Jan 15 2001 - 21:10:42 CST