diff options
| author | Kevin Vandersloot <kfv101@psu.edu> | 2002-05-14 21:52:28 +0000 |
|---|---|---|
| committer | Kevin Vandersloot <kevinv@src.gnome.org> | 2002-05-14 21:52:28 +0000 |
| commit | fd088949a12f661bf4443db75900bbe70c8278cf (patch) | |
| tree | b5de8cceb9467b96463e687c6d1783083e253f28 | |
| parent | 3cee55ef884f7f3d7513054faf14187acacbb577 (diff) | |
make panel-menu-applet a conditional compile defaulting to no since it'sGNOME_APPLETS_1_102_1
2002-05-14 Kevin Vandersloot <kfv101@psu.edu>
* configure.in, Makefile.am: make panel-menu-applet
a conditional compile defaulting to no since it's still
in a beta condition. Also clean some cruft.
* Release 1.102.1
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | configure.in | 41 |
3 files changed, 31 insertions, 40 deletions
@@ -1,3 +1,11 @@ +2002-05-14 Kevin Vandersloot <kfv101@psu.edu> + + * configure.in, Makefile.am: make panel-menu-applet + a conditional compile defaulting to no since it's still + in a beta condition. Also clean some cruft. + + * Release 1.102.1 + 2002-05-14 Anders Carlsson <andersca@gnu.org> * configure.in: Require libwnck 0.11 diff --git a/Makefile.am b/Makefile.am index 6e1d9198d..2980ce543 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,11 +5,6 @@ if BUILD_GTOP_APPLETS gtop_SUBDIRS = $(gtop_applets) endif -# wordexp_applets = screenshooter -# if HAVE_WORDEXP -# wordexp_SUBDIRS = $(wordexp_applets) -# endif - vfs_applets = \ gtik \ gweather @@ -17,13 +12,6 @@ if BUILD_GNOME_VFS_APPLETS vfs_SUBDIRS = $(vfs_applets) endif -## esd_applets = \ -## sound-monitor -## if HAVE_LIBESD -## esd_SUBDIRS = $(esd_applets) -## endif -## - cdplayer_applets = \ cdplayer if APPLET_CDPLAYER @@ -46,14 +34,16 @@ if BUILD_BATTSTAT_APPLET battstat_SUBDIR = battstat endif +if BUILD_PANEL_MENU +panel_menu_SUBDIR = panel-menu +endif + always_built_SUBDIRS = \ drivemount \ - panel-menu \ charpick \ geyes \ mini-commander \ - gkb-new -## whereami + gkb-new SUBDIRS = \ po \ @@ -64,8 +54,8 @@ SUBDIRS = \ $(gtop_SUBDIRS) \ $(vfs_SUBDIRS) \ $(battstat_SUBDIR) \ + $(panel_menu_SUBDIR) \ omf-install -## $(esd_SUBDIRS) \ DIST_SUBDIRS = \ po \ diff --git a/configure.in b/configure.in index 734fd8f64..f504bb17c 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(drivemount/drivemount.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-applets, 1.102.0) +AM_INIT_AUTOMAKE(gnome-applets, 1.102.1) AM_MAINTAINER_MODE @@ -152,25 +152,10 @@ dnl ****************************************** dnl ** ESound Library ** dnl ****************************************** -have_libesd=no -AM_PATH_ESD(,have_libesd=yes, -[AC_MSG_WARN([*** \`sound-monitor' will not be built ***])]) -AM_CONDITIONAL(HAVE_LIBESD, test yes = $have_libesd) - -dnl ****************************************** -dnl ****************************************** - - -dnl ****************************************** -dnl ** screenshooter applet check ** -dnl ****************************************** - -dnl have_wordexp=false -dnl AC_CHECK_FUNC(wordexp,have_wordexp=true) -dnl AM_CONDITIONAL(HAVE_WORDEXP,$have_wordexp) -dnl if test -z "$have_wordexp"; then -dnl AC_MSG_WARN([*** No wordexp (glibc >=2.1) Screen-shooter will not be built ***]) -dnl fi +dnl have_libesd=no +dnl AM_PATH_ESD(,have_libesd=yes, +dnl [AC_MSG_WARN([*** \`sound-monitor' will not be built ***])]) +dnl AM_CONDITIONAL(HAVE_LIBESD, test yes = $have_libesd) dnl ****************************************** dnl ****************************************** @@ -274,17 +259,25 @@ dnl *********************************************** dnl ** PanelMenu applet ** dnl *********************************************** -PKG_CHECK_MODULES(PANEL_MENU, gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libpanelapplet-2.0 >= $LIBPANEL_REQUIRED gconf-2.0 >= $GCONF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) -AC_SUBST(PANEL_MENU_CFLAGS) -AC_SUBST(PANEL_MENU_LIBS) +AC_ARG_ENABLE(panelmenu, + [ --enable-panelmenu=[no/yes] Build panel-menu applet [ default=no ]], + enable_panelmenu="$enableval", enable_panelmenu=no) + +AM_CONDITIONAL(BUILD_PANEL_MENU, test "$enable_panelmenu" = yes) + +if test x$enable_panelmenu = xyes; then + PKG_CHECK_MODULES(PANEL_MENU, gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libpanelapplet-2.0 >= $LIBPANEL_REQUIRED gconf-2.0 >= $GCONF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED) + AC_SUBST(PANEL_MENU_CFLAGS) + AC_SUBST(PANEL_MENU_LIBS) +fi # Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps") -#defined the below to enable help to work for applates +#defined the below to enable help to work for applets AC_DEFINE_UNQUOTED(DATADIR, "${prefix}/share") AC_DEFINE_UNQUOTED(SYSCONFDIR, "${prefix}/etc") |