[gcompris-devel] ./configure fails in svn trunk
Bruno Coudoin
bruno.coudoin at free.fr
Tue Oct 28 23:10:43 UTC 2008
Thanks a lot for your patch. Clearly, there was some old lines there and
your cleanup was really needed. I am glad we have a fine configure
again. Your work is commited in trunk.
Bruno.
Le mardi 28 octobre 2008 à 22:37 +0200, Yavor Doganov a écrit :
> At Sat, 25 Oct 2008 22:38:48 +0200,
> Bruno Coudoin wrote:
> >
> > Le samedi 25 octobre 2008 à 22:16 +0200, Ronny Standtke a écrit :
> > > configure.in:156: required file `./config.rpath' not found
> >
> > This is the culprit. I don't know why but there is a bug somewhere in
> > the gnu toolchain,
>
> Not a bug in the GNU build system.
>
> You are using a gettext macro, AM_ICONV, but not using gettext [1] --
> so neither gnome-autogen.sh or autoreconf run autopoint to install
> this (required by the macro) file. I guess you use
> AM_GLIB_GNU_GETTEXT because of the XML stuff. It has its own check
> for libiconv if it's not found in libc, although it is not that robust
> as gettext's implementation. So just remove this macro as it can be
> used only with gettext anyway (and AFAICS the results from the macro
> are not used anywhere in GCompris; perhaps it's just a remnant from
> the old times).
>
> [1] Which would require something like
> AM_GNU_GETTEXT([external])
> AM_GNU_GETTEXT_VERSION([0.17])
> ...but naturally it cannot be used together with AM_GLIB_GNU_GETTEXT.
>
> With these minimal changes bootstrapping succeeds for me, as well as
> "make distcheck".
>
> 2008-10-28 Yavor Doganov <yavor at gnu.org> (tiny change)
>
> * configure.in: Remove the macro AM_ICONV.
> * Makefile.am (install-data-local): Pass --mode 644 to tar and
> make the directories in the destination readable in order to
> support installation from a read-only media.
> (uninstall-local): New target.
> (CONFIG_CLEAN_FILES): Add gcompris-installer.nsi and
> Makefile.mingw.
> * boards/paintings/Makefile.am (CLEANFILES):
> * boards/babymatch/Makefile.am (CLEANFILES):
> * boards/imagename/Makefile.am (CLEANFILES):
> * boards/babyshapes/Makefile.am (CLEANFILES):
> * boards/doubleentry/Makefile.am (CLEANFILES):
> * boards/geography_country/Makefile.am (CLEANFILES):
> * boards/chronos/Makefile.am (CLEANFILES):
> * boards/geography/Makefile.am (CLEANFILES): New variables.
> * docs/eu/Makefile.am (install-data-local):
> * docs/fr/Makefile.am (install-data-local): Comment out the
> * whole rule as is done for the English manual.
> * src/boards/Makefile.am (INCLUDES):
> * src/gcompris/Makefile.am (INCLUDES): Use $(top_scrdir) to
> support out-of-tree builds.
>
> Index: src/gcompris/Makefile.am
> ===================================================================
> --- src/gcompris/Makefile.am (revision 3585)
> +++ src/gcompris/Makefile.am (working copy)
> @@ -46,9 +46,8 @@
> bin_PROGRAMS = gcompris
>
> INCLUDES = \
> - -I$(top_builddir)/intl \
> -DDATADIR=\""$(datadir)"\" \
> - -I$(top_builddir)/src \
> + -I$(top_srcdir)/src \
> $(GCOMPRIS_CFLAGS) \
> $(GNOME_INCLUDEDIR) \
> $(XML_CFLAGS) \
> @@ -132,4 +131,4 @@
> Makefile.mingw gcomprisrc.rc
>
>
> -gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString
> \ No newline at end of file
> +gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString
> Index: src/boards/Makefile.am
> ===================================================================
> --- src/boards/Makefile.am (revision 3585)
> +++ src/boards/Makefile.am (working copy)
> @@ -77,8 +77,7 @@
>
> libdir = $(plugindir)
> INCLUDES = \
> - -I$(top_builddir)/src \
> - -I$(top_builddir)/intl \
> + -I$(top_srcdir)/src \
> $(GCOMPRIS_CFLAGS) \
> $(XML_CFLAGS) \
> $(PYTHON_CFLAGS) \
> Index: docs/fr/Makefile.am
> ===================================================================
> --- docs/fr/Makefile.am (revision 3585)
> +++ docs/fr/Makefile.am (working copy)
> @@ -15,11 +15,11 @@
> # FIXME: Is it possible to have I18N info files installed ?
> #info_TEXINFOS = gcompris.texi
>
> -install-data-local:
> - $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) gcompris.html $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
> +# install-data-local:
> +# $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) gcompris.html $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
>
> gcompris.html: gcompris.texi
> texi2html -monolithic $<
> Index: docs/eu/Makefile.am
> ===================================================================
> --- docs/eu/Makefile.am (revision 3585)
> +++ docs/eu/Makefile.am (working copy)
> @@ -15,11 +15,11 @@
> # FIXME: Is it possible to have I18N info files installed ?
> #info_TEXINFOS = gcompris.texi
>
> -install-data-local:
> - $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) gcompris.html $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
> - $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
> +# install-data-local:
> +# $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) gcompris.html $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
> +# $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
>
> gcompris.html: gcompris.texi
> texi2html -monolithic $<
> Index: boards/geography/Makefile.am
> ===================================================================
> --- boards/geography/Makefile.am (revision 3585)
> +++ boards/geography/Makefile.am (working copy)
> @@ -21,6 +21,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/chronos/Makefile.am
> ===================================================================
> --- boards/chronos/Makefile.am (revision 3585)
> +++ boards/chronos/Makefile.am (working copy)
> @@ -26,6 +26,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/geography_country/Makefile.am
> ===================================================================
> --- boards/geography_country/Makefile.am (revision 3585)
> +++ boards/geography_country/Makefile.am (working copy)
> @@ -24,6 +24,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/doubleentry/Makefile.am
> ===================================================================
> --- boards/doubleentry/Makefile.am (revision 3585)
> +++ boards/doubleentry/Makefile.am (working copy)
> @@ -16,6 +16,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/babyshapes/Makefile.am
> ===================================================================
> --- boards/babyshapes/Makefile.am (revision 3585)
> +++ boards/babyshapes/Makefile.am (working copy)
> @@ -25,6 +25,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/imagename/Makefile.am
> ===================================================================
> --- boards/imagename/Makefile.am (revision 3585)
> +++ boards/imagename/Makefile.am (working copy)
> @@ -19,6 +19,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/babymatch/Makefile.am
> ===================================================================
> --- boards/babymatch/Makefile.am (revision 3585)
> +++ boards/babymatch/Makefile.am (working copy)
> @@ -20,6 +20,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: boards/paintings/Makefile.am
> ===================================================================
> --- boards/paintings/Makefile.am (revision 3585)
> +++ boards/paintings/Makefile.am (working copy)
> @@ -20,6 +20,4 @@
> $(xml_DATA): %.xml: %.xml.in
> sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
>
> -
> -
> -
> +CLEANFILES = $(xml_DATA)
> Index: configure.in
> ===================================================================
> --- configure.in (revision 3585)
> +++ configure.in (working copy)
> @@ -153,8 +153,6 @@
> dnl glib-genmarshal
> AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
>
> -AM_ICONV
> -
> dnl XF86VidMode allows us to set the screen resolution dynamically
> AC_PATH_X
>
> Index: Makefile.am
> ===================================================================
> --- Makefile.am (revision 3585)
> +++ Makefile.am (working copy)
> @@ -57,16 +57,18 @@
> config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
> gcompris-installer.nsi.in
>
> -
> distcore = $(PACKAGE)-core-$(VERSION)
>
> install-data-local:
> @$(NORMAL_INSTALL)
> if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
> $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \
> - cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
> + cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --mode 644 * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf - ; find -type d -exec chmod 755 '{}' \;) ; cd .. ; \
> fi
>
> +uninstall-local:
> + -find $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) -name '*' -delete
> +
> dist-hook:
> if test -d $(PACKAGE_DATA_DIR); then \
> $(mkinstalldirs) $(distdir)/$(PACKAGE_DATA_DIR); \
> @@ -74,7 +76,8 @@
> fi
>
>
> -CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw
> +CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw \
> + gcompris-installer.nsi Makefile.mingw
>
> clean-local:
> rm -f intltool-extract intltool-merge intltool-update
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> gcompris-devel mailing list
> gcompris-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gcompris-devel
--
Bruno Coudoin
http://gcompris.net Free educational software for kids
http://toulibre.org Logiciel Libre à Toulouse
More information about the Gcompris-devel
mailing list