~ubuntu-branches/ubuntu/hardy/gdm/hardy-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-12-11 15:34:43 UTC
  • mfrom: (1.4.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20071211153443-ndi1b5u2d6oybb7p
Tags: 2.20.2-1ubuntu1
* Sync with Debian
* debian/control.in:
  - Breaks on packages using the previous socket location
  - Depend on kbd | console-tools for fgconsole
  - Depends on alsa-utils for gdmplay
  - Recommends ubuntu-artwork | edubuntu-artwork | xubuntu-default-settings, 
    ubuntu-sounds
  - the package in maintained by the desktop team on Ubuntu
* debian/control.in, debian/gdm.dirs, debian/gdm.install:
  - don't install the Debian theme
* debian/gdm.init:
  - use the Ubuntu init version
* debian/gdm.install:
  - list gdmplay binary
* debian/gdm.templates:
  - Fix template to point to /usr/sbin/gdm not /usr/bin. (LP: 129017)
* debian/gdmplay:
  - small asound wrapper
* debian/patches/01_xconfigoptions.patch:
  - patch configure to use "-br" (Ubuntu: #12985).
* debian/patches/01_xrdb_nocpp.patch:
  - call xrdb with the "nocpp" option (Ubuntu: #14268).
* debian/patches/04_menu_changes.patch:
  - don't display some of the menu items
* debian/patches/06_no_conffile_diff_due_to_comment_change.patch:
  - don't change comments to gdm.conf-custom to not get a conffile change
    on upgrade (Ubuntu: #92302)
* debian/patches/08_notify_ck_about_static_server.patch:
  - "Notify ck about initial static server."
* debian/patches/10_noxkeepcrashing.patch:
  - option NoXKeepsCrashing to disable all XKeepsCrashing code.
* debian/patches/11_powermanagement.patch:
  - add hibernate action
  - fix typo in the hibernate command configuration (LP: #151788)
  - make the hibernate action being listed (LP: #151848)
* debian/patches/15_usplash.patch:
  - Log that we're starting up gdm before stopping usplash. If usplash was
    running, don't bother logging successful startup, as it will look
    weird on the console.
  - If usplash was running, wait a short while for the active console to
    change after starting up gdm, to try to avoid visible console noise
    from later init scripts
* debian/patches/16_configure_menu_item.patch:
  - drop the configure option from gdmsetup, it's not sudo friendly
* debian/patches/18_combo_box_language_selector.patch:
  - use a combo box for the language selector
* debian/patches/19_remove_drop_shadows.patch:
  - removed the black drop shadow from GDM windows, 
* debian/patches/20_timedlogindelay_min_value_change.patch:
  - change minimal TimedLoginDelay to 1 (Ubuntu: #84239)
* debian/patches/35_gdm.conf.patch:
  - SuspendCommand=/usr/sbin/pmi action sleep
  - HibernateCommand=/usr/sbin/pmi action hibernate
  - SoundProgram=/usr/lib/gdmplay
  - GtkTheme=Human
  - ConfigAvailable=false
  - BackgroundColor=#dab08
  - GraphicalThemedColor=#dab082
  - use "Browser=true" so the users lists work correctly (LP: 115952)
  - set SoundOnLoginFile value to question.wav (LP: 131601)
* debian/patches/41_config-files.patch:
  - dropped, don't use Debian configuration file location hack
* debian/patches/56_xnest-wrapper.patch:
  - updated
* debian/patches/63_xrandr_virtual.patch:
  - on randr1.0 drivers, set the virtual to the screen resolution in 
    order to avoid panning setups (part of LP: 137517)
* debian/patches/70_mandatory-relibtoolize.patch:
  - updated
* debian/patches/90_workaround_init_color.patch:
  - set the color to use in the PreSession to workaround a bug
* debian/rules:
  - change custom configuration file naming
  - set the standard configuration location
  - specify the correct at-spi directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
AC_INIT(daemon/gdm.h)
3
3
 
4
4
AM_CONFIG_HEADER(config.h)
5
 
AM_INIT_AUTOMAKE(gdm,2.20.0)
 
5
AM_INIT_AUTOMAKE(gdm,2.20.2)
6
6
AC_CONFIG_MACRO_DIR([m4])
7
7
AM_MAINTAINER_MODE
8
8
AC_GNU_SOURCE
12
12
GNOME_DOC_INIT
13
13
 
14
14
DBUS_REQUIRED=0.30
15
 
GLIB_REQUIRED=2.8.0
 
15
GLIB_REQUIRED=2.12.0
16
16
GTK_REQUIRED=2.6.0
17
17
PANGO_REQUIRED=1.3.0
18
18
LIBGLADE_REQUIRED=1.99.2
236
236
 
237
237
EXTRA_DAEMON_LIBS=""
238
238
EXTRA_CHOOSER_LIBS=""
239
 
EXTRA_XNEST_LIBS=""
240
 
EXTRA_FLEXI_LIBS=""
241
 
EXTRA_DYNAMIC_LIBS=""
242
 
EXTRA_SETUP_LIBS=""
243
239
EXTRA_GREETER_LIBS=""
 
240
EXTRA_SOCKET_LIB=""
 
241
EXTRA_NSL_LIB=""
244
242
 
245
243
AC_CHECK_FUNC(socket,,[
246
244
              AC_CHECK_LIB(socket,socket, [
247
245
                           EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket"
248
246
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
249
 
                           EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
250
 
                           EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
251
 
                           EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
252
 
                           EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"])])
 
247
                           EXTRA_SOCKET_LIB="-lsocket"])])
253
248
AC_CHECK_FUNC(gethostbyname,,[
254
249
              AC_CHECK_LIB(nsl,gethostbyname, [
255
250
                           EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl"
256
 
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])])
 
251
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"
 
252
                           EXTRA_NSL_LIB="-lnsl"])])
257
253
AC_CHECK_FUNC(sched_yield,[
258
254
              AC_DEFINE(HAVE_SCHED_YIELD)],[
259
255
              AC_CHECK_LIB(rt,sched_yield, [
1058
1054
#
1059
1055
AC_SUBST(EXTRA_DAEMON_LIBS)
1060
1056
AC_SUBST(EXTRA_CHOOSER_LIBS)
1061
 
AC_SUBST(EXTRA_XNEST_LIBS)
1062
 
AC_SUBST(EXTRA_FLEXI_LIBS)
1063
 
AC_SUBST(EXTRA_DYNAMIC_LIBS)
1064
 
AC_SUBST(EXTRA_SETUP_LIBS)
1065
1057
AC_SUBST(EXTRA_GREETER_LIBS)
 
1058
AC_SUBST(EXTRA_SOCKET_LIB)
 
1059
AC_SUBST(EXTRA_NSL_LIB)
1066
1060
 
1067
1061
# Define different Halt, and Reboot commands differently for Solaris.
1068
1062
#
1377
1371
AC_OUTPUT([
1378
1372
Makefile
1379
1373
daemon/Makefile
 
1374
data/Makefile
 
1375
data/icons/Makefile
 
1376
data/icons/16x16/Makefile
 
1377
data/icons/16x16/apps/Makefile
 
1378
data/icons/22x22/Makefile
 
1379
data/icons/22x22/apps/Makefile
 
1380
data/icons/24x24/Makefile
 
1381
data/icons/24x24/apps/Makefile
 
1382
data/icons/32x32/Makefile
 
1383
data/icons/32x32/apps/Makefile
 
1384
data/icons/48x48/Makefile
 
1385
data/icons/48x48/apps/Makefile
 
1386
data/icons/scalable/Makefile
 
1387
data/icons/scalable/apps/Makefile
1380
1388
gui/Makefile
1381
1389
gui/gdmflexiserver-xnest.desktop.in
1382
1390
gui/faces/Makefile