← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnome-power-manager/lucid-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-02-05 13:28:09 UTC
  • mfrom: (2.1.49 upstream)
  • Revision ID: james.westby@ubuntu.com-20100205132809-jfmqtr00ri6flcv2
Tags: 2.29.2-0ubuntu1
https://launchpad.net/bugs/425411
* New upstream release:
  - Move the power management preferences into the hardware section of the
    control center.
  - Use the name of 'Power' for the power management preferences capplet
  - Don't rely on the cached value of the lid status, to fix a double
    suspend issue (LP: #425411)
  - Add a flag to inhibit consolekit events just after we resumed
  - Don't automatically suspend if there are suspend inhibits
  - Do not exit if hal is not available
  - Only connect to HAL if there is no xrandr backlight hardware
  - Fix compile when using an ld that defaults to --as-needed
  - Enable the help action in gnome-power-statistics. Fixes #607005
  - Ensure the window is realized before we invalidate it. Fixes #604918
  - Don't show the user a sleep failed link pointing to the quirk site
  - Show the device name even when using UPower
  - Translation updates.
* Drop patches accepted upstream: 
  + 03-run-without-hal.patch
  + 04-dont-connect-to-hal-with-xrandr.patch
  + 09-fix-double-suspend.patch
* Regenerate 90-autotools.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_PREREQ(2.60)
 
1
AC_PREREQ(2.65)
2
2
 
3
 
AC_INIT(gnome-power-manager, 2.29.1)
 
3
AC_INIT([gnome-power-manager],[2.29.2])
4
4
AC_CONFIG_SRCDIR(src)
5
5
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
6
6
AM_INIT_AUTOMAKE([foreign])
7
 
AM_CONFIG_HEADER(config.h)
 
7
AC_CONFIG_HEADERS([config.h])
8
8
AC_CONFIG_MACRO_DIR([m4])
9
9
 
10
10
# enable nice build output on automake1.11
14
14
AM_PROG_CC_C_O
15
15
 
16
16
AC_PROG_INSTALL
17
 
AM_PROG_LIBTOOL
 
17
LT_INIT
18
18
IT_PROG_INTLTOOL([0.35.0])
19
19
 
20
20
GNOME_COMPILE_WARNINGS
180
180
AC_SUBST(GDK_LIBS)
181
181
 
182
182
PKG_CHECK_MODULES(XRANDR, [
183
 
 xrandr >= $XRANDR_REQUIRED 
184
 
 xrender x11])
 
183
 xrandr >= $XRANDR_REQUIRED])
185
184
AC_SUBST(XRANDR_CFLAGS)
186
185
AC_SUBST(XRANDR_LIBS)
187
186
 
 
187
PKG_CHECK_MODULES(X11, x11 xrender)
 
188
AC_SUBST(X11_CFLAGS)
 
189
AC_SUBST(X11_LIBS)
 
190
 
188
191
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
189
192
AC_SUBST(LIBNOTIFY_CFLAGS)
190
193
AC_SUBST(LIBNOTIFY_LIBS)
368
371
  AC_CHECK_HEADER([$1],[$2],[$3],[$4])
369
372
  CPPFLAGS="$ac_save_CPPFLAGS"])
370
373
 
371
 
# Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
 
374
# Like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]), but it uses the already-computed -I directories.
372
375
#
373
376
AC_DEFUN(AC_TRY_X_COMPILE, [
374
377
  ac_save_CPPFLAGS="$CPPFLAGS"
376
379
    CPPFLAGS="$CPPFLAGS -I$includedir"
377
380
  fi
378
381
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
379
 
  AC_TRY_COMPILE([$1], [$2], [$3], [$4])
 
382
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])],[$3],[$4])
380
383
  CPPFLAGS="$ac_save_CPPFLAGS"])
381
384
 
382
385