Sam TH wrote:
>
>
> > If you agree, Sam, I could commit it for you (but please explain how
> > LIBPNG is handled?)
>
> If that actually works, then please do. However, it never works for
> me.
In that case, try the attached patch (against CVS of yesterday, so it
should be OK), and see whether there are any remaining issues.
Good luck,
Frodo
--
Frodo Looijaard <[EMAIL PROTECTED]> PGP key and more: http://huizen.dds.nl/~frodol
Defenestration n. (formal or joc.):
The act of removing Windows from your computer in disgust, usually followed
by the installation of Linux or some other Unix-like operating system.
Index: GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/GNUmakefile.am,v
retrieving revision 1.4
diff -u -2 -r1.4 GNUmakefile.am
--- GNUmakefile.am 2001/04/16 08:26:14 1.4
+++ GNUmakefile.am 2001/06/07 05:29:46
@@ -4,5 +4,7 @@
MAINTAINERCLEANFILES=GNUmakefile
-#all: expat wv psiconv
+@LOCAL_EXPAT_TRUE@all: expat
+@LOCAL_WV_TRUE@all: wv
+@LOCAL_PSICONV_TRUE@all: psiconv
expat:
Index: ac-helpers/abi-libpng.m4
===================================================================
RCS file: /cvsroot/abi/ac-helpers/abi-libpng.m4,v
retrieving revision 1.1
diff -u -2 -r1.1 abi-libpng.m4
--- ac-helpers/abi-libpng.m4 2001/04/28 21:13:08 1.1
+++ ac-helpers/abi-libpng.m4 2001/06/07 05:29:46
@@ -65,5 +65,4 @@
abi_libpng_message="supplied libpng in $1"
local_libpng="true"
- AM_CONDITIONAL(LOCAL_LIBPNG, test "$local_libpng" = "true")
else
AC_MSG_ERROR([ libpng was not found ])
@@ -74,4 +73,5 @@
fi
+AM_CONDITIONAL(LOCAL_LIBPNG, test "$local_libpng" = "true")
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(LIBPNG_LIBS)
Index: ac-helpers/abi-psiconv.m4
===================================================================
RCS file: /cvsroot/abi/ac-helpers/abi-psiconv.m4,v
retrieving revision 1.5
diff -u -2 -r1.5 abi-psiconv.m4
--- ac-helpers/abi-psiconv.m4 2001/06/06 21:54:38 1.5
+++ ac-helpers/abi-psiconv.m4 2001/06/07 05:29:46
@@ -65,5 +65,4 @@
abi_psiconv_message="supplied psiconv in $1"
local_psiconv="true"
- AM_CONDITIONAL(LOCAL_PSICONV, test "$local_psiconv" = "true")
else
AC_MSG_ERROR([ psiconv was not found ])
@@ -74,4 +73,5 @@
fi
+AM_CONDITIONAL(LOCAL_PSICONV, test "$local_psiconv" = "true")
AC_SUBST(PSICONV_CFLAGS)
AC_SUBST(PSICONV_LIBS)
Index: ac-helpers/abi-wv.m4
===================================================================
RCS file: /cvsroot/abi/ac-helpers/abi-wv.m4,v
retrieving revision 1.2
diff -u -2 -r1.2 abi-wv.m4
--- ac-helpers/abi-wv.m4 2001/04/28 21:13:08 1.2
+++ ac-helpers/abi-wv.m4 2001/06/07 05:29:46
@@ -65,5 +65,4 @@
abi_wv_message="supplied wv in $1"
local_wv="true"
- AM_CONDITIONAL(LOCAL_WV, test "$local_wv" = "true")
else
AC_MSG_ERROR([ wv was not found ])
@@ -74,4 +73,5 @@
fi
+AM_CONDITIONAL(LOCAL_WV, test "$local_wv" = "true")
AC_SUBST(WV_CFLAGS)
AC_SUBST(WV_LIBS)
Index: ac-helpers/abi-xml-parser.m4
===================================================================
RCS file: /cvsroot/abi/ac-helpers/abi-xml-parser.m4,v
retrieving revision 1.4
diff -u -2 -r1.4 abi-xml-parser.m4
--- ac-helpers/abi-xml-parser.m4 2001/04/26 11:23:54 1.4
+++ ac-helpers/abi-xml-parser.m4 2001/06/07 05:29:46
@@ -106,5 +106,4 @@
abi_xml_parser_message="supplied expat in $1"
local_expat="true"
- AM_CONDITIONAL(LOCAL_EXPAT, test "$local_expat" = "true")
else
AC_MSG_ERROR([no XML parser was found])
@@ -115,4 +114,5 @@
fi
+AM_CONDITIONAL(LOCAL_EXPAT, test "$local_expat" = "true")
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
