diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-12-01 20:48:10 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-12-01 20:48:10 +0000 |
| commit | 214bcceaea63ce12c9e991fe60aa1bfa007a06ed (patch) | |
| tree | 3deff197bc911bee32b20e32fd4cf5987a062b5d | |
| parent | 5e1439f89e7acd7d57c4027eea2160953fb323f1 (diff) | |
| download | metacity-214bcceaea63ce12c9e991fe60aa1bfa007a06ed.tar.gz | |
conditionalize building the config dialog
2002-12-01 Havoc Pennington <hp@pobox.com>
* src/tools/Makefile.am: conditionalize building the config dialog
* configure.in (BUILD_CONFIG_DIALOG): add --enable-config-dialog
option to turn on the "window focus" dialog. This is part of
deprecating this dialog.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 14 |
3 files changed, 38 insertions, 14 deletions
@@ -1,3 +1,11 @@ +2002-12-01 Havoc Pennington <hp@pobox.com> + + * src/tools/Makefile.am: conditionalize building the config dialog + + * configure.in (BUILD_CONFIG_DIALOG): add --enable-config-dialog + option to turn on the "window focus" dialog. This is part of + deprecating this dialog. + 2002-11-30 Havoc Pennington <hp@pobox.com> * src/screen.c (STARTUP_TIMEOUT): lengthen to 15 seconds diff --git a/configure.in b/configure.in index b305f181..b361af58 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,12 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl +AC_ARG_ENABLE(config-dialog, [ --enable-config-dialog enable the config dialog that you need with GNOME 2.0 (obsolete with GNOME 2.2)],enable_config_dialog=yes,enable_config_dialog=no) + +AM_CONDITIONAL(BUILD_CONFIG_DIALOG, test x$enable_config_dialog = xyes) +if test x$enable_config_dialog = xyes; then + AC_DEFINE(BUILD_CONFIG_DIALOG,1,[Build configuration dialog]) +fi ## try definining HAVE_BACKTRACE AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)]) @@ -254,16 +260,16 @@ dnl ========================================================================== echo " metacity-$VERSION: - prefix: ${prefix} - source code location: ${srcdir} - compiler: ${CC} - - XFree86 Xinerama: ${use_xfree_xinerama} - Solaris Xinerama: ${use_solaris_xinerama} - Multihead: ${with_multihead} - Startup notification: ${with_startup_notification} - Session management: ${found_sm} - Shape extension: ${found_shape} - Resize-and-rotate: ${found_randr} - + prefix: ${prefix} + source code location: ${srcdir} + compiler: ${CC} + + XFree86 Xinerama: ${use_xfree_xinerama} + Solaris Xinerama: ${use_solaris_xinerama} + Multihead: ${with_multihead} + Startup notification: ${with_startup_notification} + Session management: ${found_sm} + Shape extension: ${found_shape} + Resize-and-rotate: ${found_randr} + Deprecated config dialog: ${enable_config_dialog} " diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 61bd3291..13c57737 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -21,10 +21,12 @@ metacity_mag_SOURCES= \ metacity_grayscale_SOURCES= \ metacity-grayscale.c +if BUILD_CONFIG_DIALOG metacity_properties_SOURCES= \ metacity-properties.c metacity_properties_LDFLAGS = -export-dynamic +endif uidir=$(pkgdatadir)/glade ui_DATA=metacity-properties.glade @@ -36,16 +38,24 @@ desktopdir=$(datadir)/control-center-2.0/capplets Desktop_in_files=metacity-properties.desktop.in desktop_DATA=$(Desktop_in_files:.desktop.in=.desktop) -bin_PROGRAMS=metacity-message metacity-window-demo metacity-properties +if BUILD_CONFIG_DIALOG +CONFIG_DIALOG=metacity-properties +else +CONFIG_DIALOG= +endif + +bin_PROGRAMS=metacity-message metacity-window-demo $(CONFIG_DIALOG) ## cheesy hacks I use, don't really have any business existing. ;-) noinst_PROGRAMS=metacity-mag metacity-grayscale metacity_message_LDADD= @METACITY_MESSAGE_LIBS@ metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -metacity_properties_LDADD= @METACITY_PROPS_LIBS@ metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ +if BUILD_CONFIG_DIALOG +metacity_properties_LDADD= @METACITY_PROPS_LIBS@ +endif EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(Desktop_in_files) |