grim/guifications2

More build system fixes...
org.guifications.gf2
2007-02-24, Gary Kramlich
4d8cad9f619d
Parents 4cdf51cddadc
Children a99048ca54d5
More build system fixes...
2 files changed, 5 insertions(+), 6 deletions(-)
  • +2 -4
    configure.ac
  • +3 -2
    src/Makefile.am
    • --- a/configure.ac Sat Feb 24 21:07:45 2007 -0500
    +++ b/configure.ac Sat Feb 24 21:15:03 2007 -0500
    @@ -82,12 +82,10 @@
    # Check for gaim
    #
    -PKG_CHECK_MODULES(PIDGIN, pidgin,
    -[
    - AC_DEFINE(HAVE_PIDGIN, 1, [Define if we've found pidgin.])
    -])
    +PKG_CHECK_MODULES(PIDGIN, pidgin purple)
    AC_SUBST(PIDGIN_CFLAGS)
    +AC_SUBST(PIDGIN_LIBS)
    PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
    PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
    AC_SUBST(PIDGIN_LIBDIR)
    --- a/src/Makefile.am Sat Feb 24 21:07:45 2007 -0500
    +++ b/src/Makefile.am Sat Feb 24 21:15:03 2007 -0500
    @@ -59,7 +59,8 @@
    $(BINRELOC_LIBS) \
    $(GTK_LIBS) \
    $(GLIB_LIBS) \
    - $(PANGOFT2_LIBS)
    + $(PANGOFT2_LIBS) \
    + $(PIDGIN_LIBS)
    endif
    @@ -72,4 +73,4 @@
    $(GTK_CFLAGS) \
    $(GLIB_CFLAGS) \
    $(PANGOFT2_CFLAGS) \
    - $(GAIM_CFLAGS)
    + $(PIDGIN_CFLAGS)