diff --git a/ChangeLog b/ChangeLog index ee433ec79..5910e1bb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 19 03:31:08 1998 John Ellis + + * configure.in: variable PROGRAM_GMENU with a check for + gtk/gtkctree.h which is in the devel GTK. + * Makefile.am: added above variable in the subdirs section, now + gmenu is built/installed by default if the devel GTK is found. + 1998-07-19 Raja R Harinath * configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than diff --git a/Makefile.am b/Makefile.am index b5f8f8f3f..7aeacd282 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = intl po macros \ panel applets \ gsm smproxy pixmaps desktop-links desktop-properties help-browser \ - gnome-terminal core-docs + gnome-terminal core-docs @PROGRAM_GMENU@ ## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change @MAINT@include macros/macros.dep diff --git a/configure.in b/configure.in index 087aa3a6c..cc00abde8 100644 --- a/configure.in +++ b/configure.in @@ -203,6 +203,11 @@ LIBS="$oLIBS" dnl AC_CONFIG_SUBDIRS(gemvt) +dnl gmenu requires ctree in the devel GTK 1.1, this is a simple check +dnl for gtk/gtkctree.h +AC_CHECK_HEADERS(gtk/gtkctree.h,[PROGRAM_GMENU=gmenu]) +AC_SUBST(PROGRAM_GMENU) + AC_OUTPUT([ Makefile po/Makefile.in