From 908a9f6f4ac4de81b24dfbec273d869ad44eeed0 Mon Sep 17 00:00:00 2001 From: Dan Egnor <egnor@ofb.net> Date: Sun, 26 Oct 2003 00:42:25 +0000 Subject: [PATCH] Use libwww-config --- configure.ac | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index dc60aa2..659713e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,16 +86,21 @@ if test xno != x$with_tcl; then fi if test xyes = x$with_libwww; then - AC_CHECK_LIB(wwwcore,HTEvent_setRegisterCallback,[ - LIBOOP_LIBS="liboop-www.la $LIBOOP_LIBS" - AC_DEFINE(HAVE_WWW) - # This is just a little unpleasant. - WWW_LIBS=" \ - -lwwwapp -lwwwcache -lwwwcore -lwwwdir -lwwwfile -lwwwftp -lwwwgopher \ - -lwwwhtml -lwwwhttp -lwwwinit -lwwwmime -lwwwmux -lwwwnews -lwwwstream \ - -lwwwtelnet -lwwwtrans -lwwwutils -lwwwzip -lmd5" - WWW_INCLUDES="-I/usr/include/w3c-libwww" # the libwww RPM puts headers here - ],,-lwwwutils) + save_libs="$LIBS" + save_cppflags="$CPPFLAGS" + AC_CHECK_PROG(PROG_WWW_CONFIG,libwww-config,libwww-config) + if test -n "$PROG_WWW_CONFIG" ; then + WWW_INCLUDES="`libwww-config --cflags`" + WWW_LIBS="`libwww-config --libs`" + LIBS="$save_libs $WWW_LIBS" + CPPFLAGS="$save_cppflags $WWW_INCLUDES" + AC_CHECK_FUNC(HTEvent_setRegisterCallback,[ + LIBOOP_LIBS="liboop-www.la $LIBOOP_LIBS" + AC_DEFINE(HAVE_WWW) + ]) + fi + LIBS="$save_libs" + CPPFLAGS="$save_cppflags" fi if test -z "$no_wacky_libs" ; then -- GitLab