gnome-session r4644 - trunk
- From: lucasr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-session r4644 - trunk
- Date: Thu, 10 Apr 2008 18:58:36 +0100 (BST)
Author: lucasr
Date: Thu Apr 10 18:58:36 2008
New Revision: 4644
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4644&view=rev
Log:
2008-04-10 Lucas Rocha <lucasr gnome org>
* configure.in: several cosmetic changes.
Modified:
trunk/ChangeLog
trunk/configure.in
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Apr 10 18:58:36 2008
@@ -57,8 +57,9 @@
DBUS_GLIB_REQUIRED=0.35
GNOME_KEYRING_REQUIRED=2.21.92
-dnl pkg-config dependency checks
-
+dnl ====================================================================
+dnl Dependency Checks
+dnl ====================================================================
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(GNOME_SESSION, glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
@@ -72,7 +73,9 @@
PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0)
PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0)
-dnl gconf checks
+dnl ====================================================================
+dnl GConf Checks
+dnl ====================================================================
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test x"$GCONFTOOL" = xno; then
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
@@ -80,7 +83,6 @@
AM_GCONF_SOURCE_2
-# gconf-sanity-check
GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0`
old_path=$PATH
if test x"$GCONF_SERVERDIR" != x; then
@@ -95,6 +97,9 @@
AC_SUBST(GCONF_SANITY_CHECK)
PATH=$old_path
+dnl ====================================================================
+dnl GNOME Keyring Checks
+dnl ====================================================================
AC_PATH_PROG(GNOME_KEYRING_DAEMON, gnome-keyring-daemon, no)
if test x"$GNOME_KEYRING_DAEMON" = xno; then
AC_MSG_ERROR([gnome-keyring-daemon executable not found in your path - should be installed with gnome-keyring])
@@ -102,14 +107,15 @@
AC_SUBST(GNOME_KEYRING_DAEMON)
PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
+dnl ====================================================================
dnl X development libraries check
+dnl ====================================================================
-#
# If Pango included the shared library dependencies from X11 in
# the pkg-config output, then we use that (to avoid duplicates).
# but if they were omitted to avoid binary compatibility problems
# then we need to repeat the checks.
-#
+
if $PKG_CONFIG --exists pangoxft ; then
PANGO_PACKAGES="pangox pangoxft"
else
@@ -139,25 +145,21 @@
AC_SUBST(X_LIBS)
-dnl -----------------------------------------------------------
-
-dnl ------------------
-dnl | Language Support |---------------------------------------
-dnl ------------------
+dnl ====================================================================
+dnl Language Support
+dnl ====================================================================
GETTEXT_PACKAGE=gnome-session-2.0
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The gettext translation domain])
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
-dnl -----------------------------------------------------------
-dnl -------------------------------
-dnl | Headers |--------------------------
-dnl -------------------------------
+dnl ====================================================================
+dnl Headers
+dnl ====================================================================
AC_HEADER_STDC
AC_CHECK_HEADERS(syslog.h tcpd.h sys/param.h)
-dnl -----------------------------------------------------------
dnl ====================================================================
dnl Check for newish X interface
@@ -166,7 +168,6 @@
CFLAGS="$CFLAGS $X_CFLAGS"
AC_CHECK_HEADERS(X11/Xtrans/Xtrans.h)
CFLAGS="$oCFLAGS"
-dnl -----------------------------------------------------------
dnl ====================================================================
dnl Code for checking whether IPv6 is enabled on the system....
@@ -211,12 +212,12 @@
dnl End of IPv6 checks
dnl ==============================================================================
-dnl Don't use AC_PROG_AWK since we need the full pathname.
+# Don't use AC_PROG_AWK since we need the full pathname.
AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
AC_PATH_PROGS(PERL, perl5 perl)
-dnl define a MAINT-like variable REBUILD which is set if Perl
-dnl and awk are found, so autogenerated sources can be rebuilt
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
AC_ARG_ENABLE(rebuilds,
AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules]),,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]