From 86a4850d55fa53e180ae041e0f5a7f0537025b76 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Fri, 20 Jun 2003 12:06:51 +0000 Subject: [PATCH] New version 0.0.3: - tml-litex.xsl was not installed - guiGTK.h did not include gdome.h - configure.ac was not correctly ported to pkg-config, since it still checked for the existence of the *-config executables for all the packages editex depends on. Fixed. --- helm/DEVEL/mathml_editor/configure.ac | 89 +--------------------- helm/DEVEL/mathml_editor/debian/changelog | 9 +++ helm/DEVEL/mathml_editor/editex.pc.in | 2 +- helm/DEVEL/mathml_editor/ocaml/Makefile.am | 2 +- helm/DEVEL/mathml_editor/test/guiGTK.h | 1 + helm/DEVEL/mathml_editor/xsl/Makefile.am | 4 +- 6 files changed, 18 insertions(+), 89 deletions(-) diff --git a/helm/DEVEL/mathml_editor/configure.ac b/helm/DEVEL/mathml_editor/configure.ac index 4cc45b00a..49662e3c3 100644 --- a/helm/DEVEL/mathml_editor/configure.ac +++ b/helm/DEVEL/mathml_editor/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(editex, [0.0.2]) +AC_INIT(editex, [0.0.3]) AC_CONFIG_SRCDIR(src/TToken.hh) AM_INIT_AUTOMAKE($AC_PACKAGE_NAME, $AC_PACKAGE_VERSION) @@ -92,96 +92,15 @@ dnl PKG_CHECK_MODULES(GLIB2, glib-2.0) dnl AC_SUBST(GLIB2_CFLAGS) dnl AC_SUBST(GLIB2_LIBS) -GMETADOM_CONFIG="gmetadom-config" -GMETADOM_MIN_VERSION=0.1.0 -AC_MSG_CHECKING([for GMetaDOM C++ library] >= $GMETADOM_MIN_VERSION) -if test "x$GMETADOM_PREFIX" != "x" -then - if ${GMETADOM_PREFIX}/bin/$GMETADOM_CONFIG --version > /dev/null 2>&1 - then - GMETADOM_CONFIG=${GMETADOM_PREFIX}/bin/$GMETADOM_CONFIG - elif ! $GMETADOM_CONFIG --version > /dev/null 2>&1 - then - AC_MSG_ERROR([Could not find gmetadom anywhere (see config.log for details).]) - fi -fi - -dnl -dnl test version and init our variables -dnl -vers=`$GMETADOM_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -minvers=`echo $GMETADOM_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -if test "$vers" -ge "$minvers" -then - GMETADOM_LIBS="`$GMETADOM_CONFIG --module=gdome_cpp_smart --libs`" - GMETADOM_CFLAGS="`$GMETADOM_CONFIG --module=gdome_cpp_smart --cflags`" - AC_MSG_RESULT(found) -else - AC_MSG_ERROR([You need at least GMetaDOM (C++) $GMETADOM_MIN_VERSION for this version of $PACKAGE]) -fi - +PKG_CHECK_MODULES(GMETADOM,gdome2-cpp-smart,,AC_MSG_ERROR(can not find gmetadom)) AC_SUBST(GMETADOM_CFLAGS) AC_SUBST(GMETADOM_LIBS) -GDOMEXSLT_CONFIG="gdome_xslt_cpp_smart-config" -GDOMEXSLT_MIN_VERSION=0.0.4 -AC_MSG_CHECKING([for gdome_xslt C++ library] >= $GDOMEXSLT_MIN_VERSION) -if test "x$GDOMEXSLT_PREFIX" != "x" -then - if ${GDOMEXSLT_PREFIX}/bin/$GDOMEXSLT_CONFIG --version > /dev/null 2>&1 - then - GDOMEXSLT_CONFIG=${GDOMEXSLT_PREFIX}/bin/$GDOMEXSLT_CONFIG - elif ! $GDOMEXSLT_CONFIG --version > /dev/null 2>&1 - then - AC_MSG_ERROR([Could not find gdome_xslt anywhere (see config.log for details).]) - fi -fi - -dnl -dnl test version and init our variables -dnl -vers=`$GDOMEXSLT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -minvers=`echo $GDOMEXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -if test "$vers" -ge "$minvers" -then - GDOMEXSLT_LIBS="`$GDOMEXSLT_CONFIG --libs`" - GDOMEXSLT_CFLAGS="`$GDOMEXSLT_CONFIG --cflags`" - AC_MSG_RESULT(found) -else - AC_MSG_ERROR([You need at least gdome_xslt (C++) $GDOMEXSLT_MIN_VERSION for this version of $PACKAGE]) -fi - +PKG_CHECK_MODULES(GDOMEXSLT,gdome2-xslt-cpp-smart,,AC_MSG_ERROR(can not find gdome2-xslt)) AC_SUBST(GDOMEXSLT_CFLAGS) AC_SUBST(GDOMEXSLT_LIBS) -GTKMATHVIEW_CONFIG="gtkmathview-config" -GTKMATHVIEW_MIN_VERSION=0.4.0 -AC_MSG_CHECKING([for gtkmathview library] >= $GTKMATHVIEW_MIN_VERSION) -if test "x$GTKMATHVIEW_PREFIX" != "x" -then - if ${GTKMATHVIEW_PREFIX}/bin/$GTKMATHVIEW_CONFIG --version > /dev/null 2>&1 - then - GTKMATHVIEW_CONFIG=${GTKMATHVIEW_PREFIX}/bin/$GTKMATHVIEW_CONFIG - elif ! $GTKMATHVIEW_CONFIG --version > /dev/null 2>&1 - then - AC_MSG_ERROR([Could not find gtkmathview anywhere (see config.log for details).]) - fi -fi - -dnl -dnl test version and init our variables -dnl -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" -ge "$minvers" -then - GTKMATHVIEW_LIBS="`$GTKMATHVIEW_CONFIG --libs`" - GTKMATHVIEW_CFLAGS="`$GTKMATHVIEW_CONFIG --cflags`" - AC_MSG_RESULT(found) -else - AC_MSG_ERROR([You need at least gtkmathview $GTKMATHVIEW_MIN_VERSION for this version of $PACKAGE]) -fi - +PKG_CHECK_MODULES(GTKMATHVIEW,gtkmathview,,AC_MSG_ERROR(can not find gtkmathview)) AC_SUBST(GTKMATHVIEW_CFLAGS) AC_SUBST(GTKMATHVIEW_LIBS) diff --git a/helm/DEVEL/mathml_editor/debian/changelog b/helm/DEVEL/mathml_editor/debian/changelog index c17361844..35c289ef2 100644 --- a/helm/DEVEL/mathml_editor/debian/changelog +++ b/helm/DEVEL/mathml_editor/debian/changelog @@ -1,3 +1,12 @@ +editex (0.0.3-1) unstable; urgency=low + + * New upstream release. + * Bug fix: tml-litex.xsl was not installed + * Bug fix: Makefile.ac did not use pkg-config to look for the existence + of the required packages (that, in the meantime, started using pkg-config) + As a result, the required packages were no longer detected by ./configure + + -- Claudio Sacerdoti Coen Thu, 19 Jun 2003 12:58:21 +0200 editex (0.0.2-1) unstable; urgency=low * New upstream release. diff --git a/helm/DEVEL/mathml_editor/editex.pc.in b/helm/DEVEL/mathml_editor/editex.pc.in index 0a0172449..9e2c91bf4 100644 --- a/helm/DEVEL/mathml_editor/editex.pc.in +++ b/helm/DEVEL/mathml_editor/editex.pc.in @@ -13,7 +13,7 @@ default_tex_xsl=${pkgdatadir}/tml-tex.xsl Name: EdiTeX Description: An XML/MathML editor based on TeX/LaTeX syntax Version: @VERSION@ -Requires: glib-2.0 +Requires: glib Libs: -L${libdir} -leditex Cflags: -I${includedir}/editex diff --git a/helm/DEVEL/mathml_editor/ocaml/Makefile.am b/helm/DEVEL/mathml_editor/ocaml/Makefile.am index 14cd3934c..cd0b51fa2 100644 --- a/helm/DEVEL/mathml_editor/ocaml/Makefile.am +++ b/helm/DEVEL/mathml_editor/ocaml/Makefile.am @@ -69,8 +69,8 @@ $(ARCHIVE).cma: $(CMO_S) $(ARCHIVE).cmxa: $(CMX_S) $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMX_S) $(SHARED_LIBS) +# use .lo for ocamlmklib $(DLL) $(ARCHIVE).a: $(LO_S) - # use .lo for ocamlmklib for f in $(LO_S); do \ cp $$f $$f.o; \ done diff --git a/helm/DEVEL/mathml_editor/test/guiGTK.h b/helm/DEVEL/mathml_editor/test/guiGTK.h index 861341a2e..7e3e20735 100644 --- a/helm/DEVEL/mathml_editor/test/guiGTK.h +++ b/helm/DEVEL/mathml_editor/test/guiGTK.h @@ -27,6 +27,7 @@ #define guiGTK_h #include +#include #include diff --git a/helm/DEVEL/mathml_editor/xsl/Makefile.am b/helm/DEVEL/mathml_editor/xsl/Makefile.am index f3ac30fff..283941298 100644 --- a/helm/DEVEL/mathml_editor/xsl/Makefile.am +++ b/helm/DEVEL/mathml_editor/xsl/Makefile.am @@ -1,2 +1,2 @@ -pkgdata_DATA = d-xsl.xsl tml-mmlp.xsl tml-tex.xsl tml-texid.xsl -EXTRA_DIST = d-xsl.xsl tml-mmlp.xsl tml-tex.xsl tml-texid.xsl +pkgdata_DATA = d-xsl.xsl tml-mmlp.xsl tml-tex.xsl tml-litex.xsl tml-texid.xsl +EXTRA_DIST = d-xsl.xsl tml-mmlp.xsl tml-tex.xsl tml-litex.xsl tml-texid.xsl -- 2.39.2