diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2003-08-18 00:07:47 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2003-08-18 00:07:47 (GMT) |
| commit | c90f8d2e4b5a65dec0132f870ceb33537e952410 (patch) | |
| tree | 40571799fd3b2577122b9ac581a6516a2f28258c /configure.in | |
| parent | da3ed514c97c0ebf218c581bcf20753bc29a5d9a (diff) | |
removed uneeded gcompris_pixmap.assetml changed ASSETMLDIR created
* boards/Makefile.am: removed uneeded gcompris_pixmap.assetml
* configure.in: changed ASSETMLDIR
* gcompris.spec.in: created gcompris-assetml-flags package
* src/boards/submarine.c: (submarine_create_item), (setRegleur),
(setBallastAV), (setBallastAR): added rectangle to show water level in tanks
* src/gcompris/config.c: added hindian
* po/de.po: updated by Ronny Standtke <Ronny.Standtke@gmx.de>
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.in b/configure.in index b00fbce..ad3957f 100644 --- a/configure.in +++ b/configure.in @@ -16,11 +16,6 @@ PKG_CHECK_MODULES(GCOMPRIS, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= AC_SUBST(GCOMPRIS_CFLAGS) AC_SUBST(GCOMPRIS_LIBS) -dnl For libassetml -PKG_CHECK_MODULES(GOBJECT, gobject-2.0) -AC_SUBST(GOBJECT_CFLAGS) -AC_SUBST(GOBJECT_LIBS) - dnl For embedded ogg player dnl FIXME XIPH prefix are the one needed on Mandrake ? XIPH_PATH_OGG @@ -92,7 +87,7 @@ AC_SUBST(PACKAGE_HELP_DIR) dnl Plugin Directory AC_DEFINE_UNQUOTED(PLUGIN_DIR, "${myprefix}/lib/gcompris", [Gcompris plugins directory]) -AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${myprefix}/share/pixmaps", [Gnome icons directory]) +AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${myprefix}/${DATADIRNAME}/pixmaps", [Gnome icons directory]) plugindir=$libdir/gcompris AC_SUBST(plugindir) @@ -203,6 +198,14 @@ else AC_SUBST(PYGTK_LIBS) fi +dnl For libassetml +PKG_CHECK_MODULES(GOBJECT, gobject-2.0) +AC_SUBST(GOBJECT_CFLAGS) +AC_SUBST(GOBJECT_LIBS) + +ASSETMLDIR=${DATADIRNAME}/pixmaps +AC_SUBST(ASSETMLDIR) + dnl Autoconf output AC_OUTPUT([ gcompris.spec Makefile @@ -230,6 +233,7 @@ boards/advanced_colors/Makefile boards/babymatch/Makefile boards/babyshapes/Makefile boards/doubleentry/Makefile +boards/flags/Makefile boards/geography/Makefile boards/imageid/Makefile boards/imagename/Makefile |