From 9701150c11b0826c89fdf4ab036ef57d150405ac Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Fri, 6 Nov 2009 13:33:46 +0100 Subject: [PATCH] do not hardcode cflags / ldflags for gtkhtml - use auto*-functions instead --- configure.in | 3 ++- src/Makefile.am | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 7a258f4..e91137b 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,7 @@ AM_PROG_LIBTOOL AC_LANG_CPLUSPLUS -PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.8.0], [GTKHTML], [gtkhtml-3.14 >= 3.28.0]) +PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.8.0]) +PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= 3.28.0]) AC_OUTPUT(Makefile src/Makefile ) diff --git a/src/Makefile.am b/src/Makefile.am index c77e010..12fac65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,6 @@ vido_SOURCES = main_window.cc search_dialog.cc vido.cc vido.cc_bkp noinst_HEADERS = main_window.hh search_dialog.hh -AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ +AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ @GTKHTML_CFLAGS@ -vido_LDADD = @LIBS@ @GTKMM_LIBS@ -vido_LDFLAGS = -lgtkhtml-3.14 -lzim -vido_CPPFLAGS = -I/usr/include/libgtkhtml-3.14 +vido_LDADD = @LIBS@ @GTKMM_LIBS@ @GTKHTML_LIBS@