grim/guifications1

163. see 162.

2004-07-19, Stu Tomlinson
254fb8d4839a
Parents b8d6fc121876
Children 8c9a2c149f11
163. see 162.
3 files changed, 18 insertions(+), 7 deletions(-)
  • +13 -0
    configure.ac
  • +2 -2
    pixmaps/Makefile.am
  • +3 -5
    src/Makefile.am
    • --- a/configure.ac Fri Jul 16 14:50:42 2004 +0000
    +++ b/configure.ac Mon Jul 19 18:20:43 2004 +0000
    @@ -11,6 +11,15 @@
    AC_DEFINE_UNQUOTED(GF_CONFIG_ARGS, "$ac_configure_args", [configure arguments])
    AC_PATH_PROG(sedpath, sed)
    +#
    +# Setup libtool
    +#
    +AM_PROG_LIBTOOL
    +LIBTOOL="$LIBTOOL --silent"
    +
    +PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:$HOME/lib/pkgconfig"
    +export PKG_CONFIG_PATH
    +
    #
    # Our header
    @@ -58,6 +67,10 @@
    ])
    AC_SUBST(GAIM_CFLAGS)
    +GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
    +GAIM_DATADIR=`pkg-config --variable=datadir gaim`
    +AC_SUBST(GAIM_LIBDIR)
    +AC_SUBST(GAIM_DATADIR)
    #
    # check for gtk and other dependencies
    --- a/pixmaps/Makefile.am Fri Jul 16 14:50:42 2004 +0000
    +++ b/pixmaps/Makefile.am Mon Jul 19 18:20:43 2004 +0000
    @@ -27,8 +27,8 @@
    window_zoom_out.png \
    Makefile.mingw
    -guificationsconfpixdir = $(datadir)/pixmaps/gaim/guifications/conf
    +guificationsconfpixdir = $(GAIM_DATADIR)/pixmaps/gaim/guifications/conf
    guificationsconfpix_DATA = icon_size_huge.png icon_size_large.png icon_size_normal.png icon_size_small.png icon_size_tiny.png item_position_center.png item_position_east.png item_position_north.png item_position_north_east.png item_position_north_west.png item_position_south.png item_position_south_east.png item_position_south_west.png item_position_west.png text_clipping_ellipsis_end.png text_clipping_ellipsis_middle.png text_clipping_ellipsis_start.png text_clipping_truncate.png window_position_north_east.png window_position_north_west.png window_position_south_east.png window_position_south_west.png window_zoom_in.png window_zoom_normal.png window_zoom_out.png
    -guificationsbackgroundspixdir = $(datadir)/pixmaps/gaim/guifications/backgrounds
    +guificationsbackgroundspixdir = $(GAIM_DATADIR)/pixmaps/gaim/guifications/backgrounds
    guificationsbackgroundspix_DATA = background_default.png
    --- a/src/Makefile.am Fri Jul 16 14:50:42 2004 +0000
    +++ b/src/Makefile.am Mon Jul 19 18:20:43 2004 +0000
    @@ -8,7 +8,7 @@
    gf_gtkutils.h \
    gf_types.h
    -plugindir = $(libdir)/gaim
    +plugindir = $(GAIM_LIBDIR)/gaim
    guifications_la_LDFLAGS = -module -avoid-version
    @@ -27,10 +27,8 @@
    endif
    AM_CPPFLAGS = \
    - -DLIBDIR=\"$(libdir)/gaim/\" \
    - -DDATADIR=\"$(datadir)\" \
    - -I$(top_srcdir) \
    - -I$(top_srcdir)/src \
    + -DLIBDIR=\"$(GAIM_LIBDIR)/gaim/\" \
    + -DDATADIR=\"$(GAIM_DATADIR)\" \
    $(DEBUG_CFLAGS) \
    $(GTK_CFLAGS) \
    $(GLIB_CFLAGS) \