diff options
| -rw-r--r-- | boards/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 31 | ||||
| -rw-r--r-- | src/boards/Makefile.am | 9 | ||||
| -rw-r--r-- | src/gcompris/Makefile.am | 6 |
4 files changed, 4 insertions, 48 deletions
diff --git a/boards/Makefile.am b/boards/Makefile.am index d7f6430..159dd15 100644 --- a/boards/Makefile.am +++ b/boards/Makefile.am @@ -151,11 +151,11 @@ xml_DATA = $(xml_in_files:.xml.in=.xml) # in the file themselves. GCompris pick the translations from the po file at # runtime. # -$(xml_DATA): %.xml: %.xml.in - sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@ +#$(xml_DATA): %.xml: %.xml.in +# sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@ # Use this directive and instead of the one above to embed the translations # in the xml files directly, this is needed for the tool gcompris2spip -#@INTLTOOL_XML_RULE@ +@INTLTOOL_XML_RULE@ CLEANFILES = $(xml_DATA) diff --git a/configure.in b/configure.in index ca94175..fe446e3 100644 --- a/configure.in +++ b/configure.in @@ -481,37 +481,6 @@ AC_SUBST(SQLITE3_LIBS) AC_SUBST(REQUIRE_PYTHON) -dnl PYCAIRO SUPPORT -dnl Check for pycairo -AC_ARG_ENABLE(cairo, - AC_HELP_STRING( - [--enable-cairo], - [Enable cairo support (experimental)]), - with_cairo="$enableval", with_cairo="no") - -use_cairo=no -if test x$with_cairo = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0,, AC_MSG_ERROR([*** cairo not found! get it at http://cairographics.org/ if you want --enable-cairo ])) - if test x$py_build_only = xno; then - if test x$build_python_plugin = xyes; then - PKG_CHECK_MODULES(PYCAIRO, pycairo >= 0.5.0,, AC_MSG_ERROR([*** pycairo not found! get it at http://cairographics.org/ if you want --enable-cairo ])) - AM_CHECK_PYMOD(cairo,,,AC_MSG_ERROR([*** pycairo installed but not visible from python ])) - use_cairo=yes - AC_DEFINE([USE_CAIRO],[],[use Cairo graphic library]) - else - AC_MSG_WARN([ cairo enabled without python ?]) - fi - else - AC_MSG_WARN([py-build-only: skipping test. Do not forget to install pycairo !]) - use_cairo=yes - AC_DEFINE([USE_CAIRO],[],[use Cairo graphic library]) - fi -fi - -AM_CONDITIONAL(USE_CAIRO, test x$use_cairo = xyes) -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(CAIRO_LIBS) - dnl mingw32 specific stuff. dnl use libgw32c dnl define __GW32__ and WIN32 diff --git a/src/boards/Makefile.am b/src/boards/Makefile.am index 732b3c5..81c3d5f 100644 --- a/src/boards/Makefile.am +++ b/src/boards/Makefile.am @@ -16,14 +16,6 @@ sqlite_ldflags = sqlite_cflags = endif -if USE_CAIRO -cairo_ldflags = $(CAIRO_LIBS) -cairo_cflags = $(CAIRO_CFLAGS) -else -cairo_ldflags = -cairo_cflags = -endif - if PLATFORM_WIN32 shared = -shared no_undefined = -no-undefined @@ -92,7 +84,6 @@ INCLUDES = \ $(PYTHON_CFLAGS) \ $(PYGTK_CFLAGS) \ $(sqlite_cflags) \ - $(cairo_cflags) \ $(dll_export) libawele_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am index a1ab25b..e54a398 100644 --- a/src/gcompris/Makefile.am +++ b/src/gcompris/Makefile.am @@ -120,8 +120,7 @@ gcompris_SOURCES = \ wordlist.h gcompris_LDFLAGS = \ - -export-dynamic $(cairo_ldflags) \ - $(top_builddir)/src/libgnomecanvas/libgnomecanvas-2.a \ + -export-dynamic $(top_builddir)/src/libgnomecanvas/libgnomecanvas-2.a \ $(top_builddir)/src/libart_lgpl/libart_lgpl_2.a @@ -129,9 +128,6 @@ gcompris_LDADD = \ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \ $(INTLLIBS) $(NSBUNDLE_LDFLAGS) -# $(LIBICONV) - - EXTRA_DIST = \ Makefile.mingw gcomprisrc.rc |