Re: [PATCH] Don't link hancom plugin with glib 1.2

From: Marc Maurer (j.m.maurer@student.utwente.nl)
Date: Sat Oct 25 2003 - 19:22:57 EDT

  • Next message: Marc Maurer: "Re: Commit: XML escaping, unescaping"

    Backport: patch from jeremy katz
                                                                                                                                  
    CVS:
    ----------------------------------------------------------------------
    CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
    CVS:
    CVS: Committing in .
    CVS:
    CVS: Modified Files:
    CVS: Tag: ABI-2-0-0-STABLE
    CVS: plugin.m4
    CVS:
    ----------------------------------------------------------------------

    Op wo 22-10-2003, om 02:44 schreef Dom Lachowicz:
    > Thanks, Jeremy. This is committed to HEAD.
    >
    > Dom
    >
    > --- Jeremy Katz <katzj@redhat.com> wrote:
    > > The Hancom plugin was linking against both glib 1.2
    > > and glib 2.0.
    > > Obviously not really what was desired :-)
    > >
    > > Jeremy
    > > > ---
    > >
    > abiword-2.0.0/abiword-plugins/wp/impexp/hancom/plugin.m4.noglib12
    > > 2003-10-21 16:19:52.000000000 -0400
    > > +++
    > >
    > abiword-2.0.0/abiword-plugins/wp/impexp/hancom/plugin.m4
    > > 2003-10-21 16:20:03.000000000 -0400
    > > @@ -32,18 +32,6 @@
    > >
    > > ABI_HANCOM_CPPFLAGS="-I$abi_wv_source"
    > >
    > > -if test $abi_plugin_disable = no; then
    > > - ABI_GLIB12_OPT(0,yes)
    > > - if [ test "$abi_glib_opt" = "no" ]; then
    > > - ABI_PLUGIN_REPORT([hancom: okay (using wv's mini
    > > glib)])
    > > - ABI_HANCOM_CPPFLAGS="-I$abi_wv_source/glib-wv
    > > $ABI_HANCOM_CPPFLAGS"
    > > - else
    > > - ABI_PLUGIN_REPORT([hancom: okay (using glib)])
    > > - ABI_HANCOM_CPPFLAGS="`$abi_glib_config --cflags`
    > > $ABI_HANCOM_CPPFLAGS"
    > > - ABI_HANCOM_LDFLAGS="`$abi_glib_config --libs`"
    > > - fi
    > > -fi
    > > -
    > > AC_SUBST(ABI_HANCOM_CPPFLAGS)
    > > AC_SUBST(ABI_HANCOM_LDFLAGS)
    > >
    > >
    >
    >
    > __________________________________
    > Do you Yahoo!?
    > The New Yahoo! Shopping - with improved product search
    > http://shopping.yahoo.com 

    -- 
Marc Maurer <j.m.maurer@student.utwente.nl>

    This archive was generated by hypermail 2.1.4 : Sat Oct 25 2003 - 19:17:20 EDT