mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 09:16:10 -05:00
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.
This commit is contained in:
parent
5e1439f89e
commit
214bcceaea
@ -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
|
||||
|
28
configure.in
28
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}
|
||||
"
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user