diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1999-02-22 05:59:52 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1999-02-22 05:59:52 +0000 |
| commit | 044c468e1c777c124049d036425ae5aa0fd51d0f (patch) | |
| tree | df49954449bf8a8f6f0d8ac7e31cb38d40c85409 | |
| parent | de7b6530b7c081e2442ab70358f403e20c6fba7b (diff) | |
| download | gnome-common-DII_OBJECT.tar.gz | |
Merge changes from HEAD.DII_OBJECT
Also, started cleanup of Miguel's trashcan code.
- Federico
svn path=/branches/DII_OBJECT/; revision=644
| -rw-r--r-- | macros/ChangeLog | 8 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 2 | ||||
| -rw-r--r-- | macros/gnome.m4 | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 6eed508..6195dc9 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,11 @@ +1999-02-20 Timur Bakeyev <mc@bat.ru> + + * gnome.m4: Added and exported ZVT_LIBS. + +Tue Feb 16 19:35:42 1999 Owen Taylor <otaylor@redhat.com> + + * gnome-x-checks.m4: Require GTK+-1.1.16. + 1999-02-15 Timur Bakeyev <mc@bat.ru> * gnome-gettext.m4: Work around a bug in BSDI's native sh, which in- diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 index ce3cbf7..6bc0cc1 100644 --- a/macros/gnome-x-checks.m4 +++ b/macros/gnome-x-checks.m4 @@ -15,7 +15,7 @@ dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} dnl AC_DEFUN([GNOME_X_CHECKS], [ - AM_PATH_GTK(1.1.12,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) + AM_PATH_GTK(1.1.15,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" diff --git a/macros/gnome.m4 b/macros/gnome.m4 index c1c9849..b815c78 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -11,6 +11,7 @@ AC_DEFUN([GNOME_INIT_HOOK], AC_SUBST(GNOMEUI_LIBS) AC_SUBST(GNOMEGNORBA_LIBS) AC_SUBST(GTKXMHTML_LIBS) + AC_SUBST(ZVT_LIBS) AC_SUBST(GNOME_APPLET_LIBS) AC_SUBST(GNOME_LIBDIR) AC_SUBST(GNOME_INCLUDEDIR) @@ -59,6 +60,7 @@ AC_DEFUN([GNOME_INIT_HOOK], GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" GNOME_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`" GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" |