diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-04-18 17:10:36 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-04-18 17:20:49 +0900 |
| commit | e99b692e45e58a334f466b9564fe98e8a69cc753 (patch) | |
| tree | b3569dae5c8461581ff6b7f350ac93c0c6738190 | |
| parent | 282fc63a3273c8459dd55c9aa4968b73fb97678d (diff) | |
| download | external_gettext-e99b692e45e58a334f466b9564fe98e8a69cc753.zip external_gettext-e99b692e45e58a334f466b9564fe98e8a69cc753.tar.gz external_gettext-e99b692e45e58a334f466b9564fe98e8a69cc753.tar.bz2 | |
Revert "examples: Don't error out from configure in hello-c-gnome3"
This reverts commit 5536ee522d6a9d60972c78882e2d2761cf9afdc9.
It was not necessary since xsmallpot.sh removes unneeded lines from
configure.ac.
| -rw-r--r-- | gettext-tools/examples/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-tools/examples/hello-c-gnome3/configure.ac | 40 |
2 files changed, 18 insertions, 29 deletions
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index d094577..dbef733 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,10 +1,3 @@ -2014-04-17 Daiki Ueno <ueno@gnu.org> - - examples: Don't error out from configure in hello-c-gnome3 - The configure script shouldn't fail even if there is a fatal - error, to allow the toplevel autogen.sh to regenerate POT files. - * hello-c-gnome3/configure.ac: Don't error out, but warn user. - 2014-04-15 Daiki Ueno <ueno@gnu.org> examples: Add a new example 'hello-c-gnome3' diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac index a941ce3..ddacfb0 100644 --- a/gettext-tools/examples/hello-c-gnome3/configure.ac +++ b/gettext-tools/examples/hello-c-gnome3/configure.ac @@ -15,44 +15,40 @@ AM_GNU_GETTEXT_VERSION(0.18.3) dnl Check GNOME specific stuff. dnl dnl If you have full GNOME development environment installed on your -dnl system, you should better use the following macros: +dnl system, you should be able to use the following macros: dnl dnl AM_PATH_GLIB_2_0 dnl PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10], , dnl [AC_MSG_ERROR([can't find gtk+-3.0])]) dnl -dnl However, we can't use those in the gettext-tools distribution -dnl here, to avoid dependency on external m4 files and failure when -dnl updating POT files when bootstrapping. +dnl Here, in gettext-tools/examples, we do the checks manually for +dnl simplicity. AC_PATH_PROG(GLIB_COMPILE_RESOURCES, [glib-compile-resources]) AS_IF([test -z "$GLIB_COMPILE_RESOURCES"], [ - GLIB_COMPILE_RESOURCES=: - AC_SUBST(GLIB_COMPILE_RESOURCES) - AC_MSG_WARN([can't find glib-compile-resources]) + AC_MSG_ERROR([can't find glib-compile-resources]) ]) AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, [glib-compile-schemas]) AS_IF([test -z "$GLIB_COMPILE_SCHEMAS"], [ - GLIB_COMPILE_SCHEMAS=: - AC_SUBST(GLIB_COMPILE_SCHEMAS) - AC_MSG_WARN([can't find glib-compile-schemas]) + AC_MSG_ERROR([can't find glib-compile-schemas]) ]) AC_PATH_PROG([PKG_CONFIG], [pkg-config]) AS_IF([test -z "$PKG_CONFIG"], [ - AC_MSG_WARN([can't find pkg-config]) -], [ - GTK="gtk+-3.0 >= 3.10" - AS_IF(["$PKG_CONFIG" --exists "$GTK"], [ - GTK_CFLAGS=`"$PKG_CONFIG" --cflags "$GTK"` - AC_SUBST(GTK_CFLAGS) - - GTK_LIBS=`"$PKG_CONFIG" --libs "$GTK"` - AC_SUBST(GTK_LIBS) - ], [ - AC_MSG_WARN([can't find $GTK]) -])]) + AC_MSG_ERROR([can't find pkg-config]) +]) + +GTK="gtk+-3.0 >= 3.10" +AS_IF(["$PKG_CONFIG" --exists "$GTK"], , [ + AC_MSG_ERROR([can't find $GTK]) +]) + +GTK_CFLAGS=`"$PKG_CONFIG" --cflags "$GTK"` +AC_SUBST(GTK_CFLAGS) + +GTK_LIBS=`"$PKG_CONFIG" --libs "$GTK"` +AC_SUBST(GTK_LIBS) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) |