A tip-off for Dillo developers: FLTK2 will shortly rename its installed libraries and configuration scripts from *fltk* to *fltk2* . This means that Dillo's configure.in will then have to refer to fltk2-config everywhere instead of fltk-config . Cheers, Jeremy Henty
* Jeremy Henty (jeremy@chaos.org.uk):
A tip-off for Dillo developers: FLTK2 will shortly rename its installed libraries and configuration scripts from *fltk* to *fltk2* . This means that Dillo's configure.in will then have to refer to fltk2-config everywhere instead of fltk-config .
This patch does the trick for me, compile tested against FLTK2 r4948: Index: configure.in =================================================================== RCS file: /sfhome/cvs/dillo/dillo/configure.in,v retrieving revision 1.94 diff -p -u -r1.94 configure.in --- configure.in 8 Apr 2006 12:25:19 -0000 1.94 +++ configure.in 16 Apr 2006 16:13:35 -0000 @@ -37,7 +37,6 @@ AC_ARG_ENABLE(dlgui, [ --disable-dlgui enable_dlgui=$enableval, enable_dlgui=yes) AC_ARG_ENABLE(threaded-dns,[ --disable-threaded-dns Disable the advantage of a reentrant resolver library], enable_threaded_dns=$enableval, enable_threaded_dns=yes) -AM_CONDITIONAL(DLGUI, test x$enable_dlgui = xyes) AC_PROG_CC AM_PROG_CC_STDC @@ -114,12 +113,21 @@ dnl ----------------------------------- dnl Check for FLTK dnl ----------------------------------- dnl -dnl For debugging and to be user friendly - AC_MSG_CHECKING([Hackish check for FLTK]) -dnl Call the config sripts. - LIBFLTK_CXXFLAGS=`fltk-config --cxxflags` - LIBFLTK_LIBS=`fltk-config --ldflags` - +dnl FLTK2 snapshots prior to r4948 used fltk-config instead of fltk2-config: +if test "x$enable_dlgui" = "xyes"; then + AC_PATH_PROGS(FLTK2_CONFIG, fltk2-config fltk-config, NOTFOUND) + dnl Call the config sripts. + if test -x "$FLTK2_CONFIG"; then + LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags` + LIBFLTK_LIBS=`$FLTK2_CONFIG --ldflags` + fltk2_ok="yes" + else + fltk2_ok="no" + fi +else + fltk2_ok="no" +fi +AM_CONDITIONAL(DLGUI, test x$fltk2_ok = xyes) dnl ---------------- dnl Test for libjpeg
participants (2)
-
Jeremy Henty
-
Thomas-Martin Seck