Removed conditional build of gmenu since gtk+-1.1 is now a requirement.
Thu Sep 17 14:20:05 1998 John Ellis <johne@bellatlantic.net> * configure.in, Makefile.am: Removed conditional build of gmenu since gtk+-1.1 is now a requirement.
This commit is contained in:
parent
adb7ae7856
commit
a9f1042033
3 changed files with 8 additions and 13 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Sep 17 14:20:05 1998 John Ellis <johne@bellatlantic.net>
|
||||||
|
|
||||||
|
* configure.in, Makefile.am: Removed conditional build of gmenu since
|
||||||
|
gtk+-1.1 is now a requirement.
|
||||||
|
|
||||||
1998-09-11 Alexandre Muniz <munizao@cyberhighway.net>
|
1998-09-11 Alexandre Muniz <munizao@cyberhighway.net>
|
||||||
* configure.in (AC_OUTPUT): Added applets/charpick
|
* configure.in (AC_OUTPUT): Added applets/charpick
|
||||||
|
|
||||||
|
|
10
Makefile.am
10
Makefile.am
|
@ -1,7 +1,3 @@
|
||||||
if PROGRAM_GMENU
|
|
||||||
gmenu = gmenu
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ORBIT_INSTALLED
|
if ORBIT_INSTALLED
|
||||||
control_center = control-center
|
control_center = control-center
|
||||||
capplets = capplets
|
capplets = capplets
|
||||||
|
@ -11,12 +7,12 @@ endif
|
||||||
|
|
||||||
always_built_SUBDIRS = \
|
always_built_SUBDIRS = \
|
||||||
gsm smproxy pixmaps desktop-links desktop-properties help-browser \
|
gsm smproxy pixmaps desktop-links desktop-properties help-browser \
|
||||||
gnome-terminal core-docs
|
gnome-terminal core-docs gmenu
|
||||||
|
|
||||||
sometimes_built_SUBDIRS = panel applets gmenu control-center capplets
|
sometimes_built_SUBDIRS = panel applets control-center capplets
|
||||||
|
|
||||||
SUBDIRS = intl po macros \
|
SUBDIRS = intl po macros \
|
||||||
$(always_built_SUBDIRS) $(panel) $(applets) $(gmenu) $(control_center) $(capplets)
|
$(always_built_SUBDIRS) $(panel) $(applets) $(control_center) $(capplets)
|
||||||
|
|
||||||
#DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
|
#DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
|
||||||
# $(sometimes_built_SUBDIRS)
|
# $(sometimes_built_SUBDIRS)
|
||||||
|
|
|
@ -129,12 +129,6 @@ LIBS="$oLIBS"
|
||||||
|
|
||||||
dnl AC_CONFIG_SUBDIRS(gemvt)
|
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
|
|
||||||
P_GMENU=
|
|
||||||
AC_CHECK_HEADERS(gtk/gtkctree.h,[P_GMENU=gmenu])
|
|
||||||
AM_CONDITIONAL(PROGRAM_GMENU, test "$P_GMENU" = "gmenu")
|
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue