From 946cacd5c0cb7d390767f16011eac9bfa6d7e5e5 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 25 Jun 2003 16:23:35 +0000 Subject: [PATCH] forward ported to use pkg-config --- helm/helmpot/configure.in | 24 ++++++------------------ helm/helmpot/debian/changelog | 10 ++++++++++ helm/helmpot/debian/control | 6 +++--- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/helm/helmpot/configure.in b/helm/helmpot/configure.in index 640472467..3d31a0d54 100644 --- a/helm/helmpot/configure.in +++ b/helm/helmpot/configure.in @@ -48,25 +48,13 @@ if test $gtklib = "no"; then AC_MSG_ERROR(GTK is needed in order to use helmpot) fi -AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG, gtkmathview-config, yes, no) -if test $HAVE_GTKMATHVIEW_CONFIG = "no"; then - AC_MSG_ERROR(gtkmathview is required) -fi - -GTKMATHVIEW_MIN_VERSION=0.3.0 -AC_MSG_CHECKING(for gtkmathview >= $GTKMATHVIEW_MIN_VERSION) -vers=`gtkmathview-config --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -minvers=`echo $GTKMATHVIEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -if test "$vers" -lt "$minvers"; then - AC_MSG_RESULT(not found) - AC_MSG_ERROR(gtkmathview >= $GTKMATHVIEW_MIN_VERSION is required) -else - AC_MSG_RESULT(found) -fi +CFLAGS="$CFLAGS @GTKMATHVIEW_CFLAGS@" +CXXFLAGS="$CXXFLAGS @GTKMATHVIEW_CFLAGS@" +LIBS="$LIBS @GTKMATHVIEW_LIBS@" -CFLAGS="$CFLAGS `gtkmathview-config --cflags`" -CXXFLAGS="$CXXFLAGS `gtkmathview-config --cflags`" -LIBS="$LIBS `gtkmathview-config --libs`" +PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview >= 0.3.0,, AC_MSG_ERROR(could not find gtkmathview)) +AC_SUBST(GTKMATHVIEW_CFLAGS) +AC_SUBST(GTKMATHVIEW_LIBS) if test $HAVE_COLORGCC = "yes"; then CC=colorgcc diff --git a/helm/helmpot/debian/changelog b/helm/helmpot/debian/changelog index d28baeec4..32467c728 100644 --- a/helm/helmpot/debian/changelog +++ b/helm/helmpot/debian/changelog @@ -1,3 +1,13 @@ +helmpot (0.1.0-2) unstable; urgency=low + + * debian/control + - bumped standards-version to 3.5.10 + - bumped dependency on debhelper to 4.0.0 + - added ${misc:Depends} + - added build dep on pkg-config + + -- Stefano Zacchiroli Wed, 25 Jun 2003 18:20:33 +0200 + helmpot (0.1.0-1) unstable; urgency=low * New release. diff --git a/helm/helmpot/debian/control b/helm/helmpot/debian/control index 46cf68d99..5deb9e0b4 100644 --- a/helm/helmpot/debian/control +++ b/helm/helmpot/debian/control @@ -2,12 +2,12 @@ Source: helmpot Section: misc Priority: optional Maintainer: Stefano Zacchiroli -Build-Depends: debhelper (>> 2.0.0), libgtkmathview-dev -Standards-Version: 3.5.2 +Build-Depends: debhelper (>> 4.0.0), libgtkmathview-dev, pkg-config +Standards-Version: 3.5.10 Package: helmpot Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: A minimal browser for the HELM library. 'helmpot' is a minimal browser, in the form of a plug-out, for browsing the HELM library (MathML presentation). -- 2.39.2