diff options
| -rw-r--r-- | macros/gnome-gettext.m4 | 3 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/macros/gnome-gettext.m4 b/macros/gnome-gettext.m4 index 962580acbe..1dac989cbb 100644 --- a/macros/gnome-gettext.m4 +++ b/macros/gnome-gettext.m4 @@ -66,7 +66,6 @@ AC_DEFUN(AM_GNOME_WITH_NLS, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then AC_CHECK_FUNCS(dcgettext) - AC_CHECK_FUNCS(dgettext) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) @@ -77,8 +76,6 @@ AC_DEFUN(AM_GNOME_WITH_NLS, [CATOBJEXT=.mo DATADIRNAME=lib]) INSTOBJEXT=.mo - else - echo "You must install msgfmt (part of gettext)." fi fi diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 index 4ac3ba4439..1e397ef8e3 100644 --- a/macros/gnome-x-checks.m4 +++ b/macros/gnome-x-checks.m4 @@ -33,21 +33,6 @@ AC_DEFUN([GNOME_X_CHECKS], LDFLAGS="$saved_ldflags $GTK_LIBS" -dnl Check that we *don't* get GTK 1.3.* yet - - AC_MSG_CHECKING([whether we have GTK > 1.2]) - AC_EGREP_CPP(answer_affirmatively, - [#include <gtk/gtk.h> - #if GTK_MINOR_VERSION > 2 - answer_affirmatively - #endif - ], [AC_MSG_ERROR([Aborting, the current versions - of gnome are not yet compatible with the unstable GTK 1.3 release. - Please use GTK 1.2. To get Gtk 1.2 and Glib 1.2 from the CVS repo - sitory, use the commands cvs checkout -r gtk-1-2 gtk and - cvs checkout -r glib-1-2 glib.])]) - - dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow. USE_DEVGTK=true |