Index: gconf-2.m4.in
===================================================================
--- gconf-2.m4.in	(révision 2495)
+++ gconf-2.m4.in	(copie de travail)
@@ -13,8 +13,8 @@
     GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
   fi
 
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+  AC_ARG_WITH(gconf-source,
+  AC_HELP_STRING([--with-gconf-source=sourceaddress],[Config database for installing schema files.]),GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
 
   AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
   AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
@@ -23,14 +23,14 @@
     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
   fi
 
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+  AC_ARG_WITH(gconf-schema-file-dir,
+  AC_HELP_STRING([--with-gconf-schema-file-dir=dir],[Directory for installing schema files.]),GCONF_SCHEMA_FILE_DIR="$withval",)
 
   AC_SUBST(GCONF_SCHEMA_FILE_DIR)
   AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
 
   AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
+     AC_HELP_STRING([--disable-schemas-install],[Disable the schemas installation]),
      [case ${enableval} in
        yes|no) ;;
        *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
Index: configure.in
===================================================================
--- configure.in	(révision 2495)
+++ configure.in	(copie de travail)
@@ -112,8 +112,10 @@
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 dnl Default to debug spew in unstable branch
-AC_ARG_ENABLE(debug, 
-            [  --enable-debug=[no/yes/minimum]      Compile with debug checks.],,enable_debug=minimum)
+AC_ARG_ENABLE(debug,
+	      AC_HELP_STRING([--enable-debug=@<:@no/yes/minimum@:>@],
+			     [Compile with debug checks.]),
+	      ,enable_debug=minimum)
 
 if test "x$enable_debug" = "xyes"; then
         CFLAGS="$CFLAGS -DGCONF_ENABLE_DEBUG=1"
@@ -129,7 +131,10 @@
 
 GTK_DOC_CHECK([1.0])
 
-AC_ARG_ENABLE(gtk, [  --enable-gtk          Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto)
+AC_ARG_ENABLE(gtk,
+	      AC_HELP_STRING([--enable-gtk],
+			     [Enable GTK+ support (for gconf-sanity-check) @<:@default=auto@:>@]),
+	      enable_gtk="$enableval", enable_gtk=auto)
 
 PKGCONFIG_MODULES='glib-2.0 > 2.9.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0'
 PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
@@ -177,36 +182,55 @@
 
 AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk)
 
+dnl **************************************************
+dnl LDAP support.
+dnl **************************************************
 
 LDAP_LIBS=
-AC_CHECK_HEADER(ldap.h, [
-    AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"]))
+
+AC_ARG_WITH(openldap,
+	    AC_HELP_STRING([--with-openldap],
+			   [Enable LDAP backend @<:@default=auto@:>@]),
+	    ,with_openldap=auto)
+
+if test x"$with_openldap" != xno; then
+  AC_CHECK_HEADER(ldap.h, [
+      AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"]))
   ])
-AC_SUBST(LDAP_LIBS)
-AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS")
+  AC_SUBST(LDAP_LIBS)
 
-dnl **************************************************
-dnl LDAP support.
-dnl **************************************************
-if test "$os_win32" != yes; then
+  if test "$os_win32" != yes; then
+  SAVE_CFLAGS="$CFLAGS"
+  SAVE_LIBS="$LIBS"
+  LDAP_CFLAGS="-DLDAP_DEPRECATED"
+  CFLAGS="$CFLAGS $LDAP_CFLAGS"
+  LIBS="$LIBS $LDAP_LIBS"
+  AC_CHECK_FUNCS(ldap_ntlm_bind)
+  CFLAGS="$SAVE_CFLAGS"
+  LIBS="$SAVE_LIBS"
+
+  else # Win32
+  LDAP_CFLAGS="-DLDAP_DEPRECATED"
+  LDAP_LIBS="-lwldap32"
+  AC_SUBST(LDAP_CFLAGS)
+  AC_SUBST(LDAP_LIBS)
+  AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
+  msg_ldap="yes"
+  fi # Win32
+
+  if test -z "$LDAP_LIBS"; then
+    if test x"$with_openldap" = xyes; then
+      AC_MSG_ERROR([*** LDAP support explicitely requested but not found ***])
+    else
+      AC_MSG_WARN([*** LDAP support not found ***])
+    fi
+  fi
+
+else
+  AC_DEFINE(HAVE_LDAP,0,[Define if you have LDAP support])
+fi
 
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LIBS="$LIBS"
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
-CFLAGS="$CFLAGS $LDAP_CFLAGS"
-LIBS="$LIBS $LDAP_LIBS"
-AC_CHECK_FUNCS(ldap_ntlm_bind)
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
-
-else # Win32
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
-LDAP_LIBS="-lwldap32"
-AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-msg_ldap="yes"
-fi # Win32
+AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS")
 
 IT_PROG_INTLTOOL([0.35.0])
 
