diff --git a/ChangeLog b/ChangeLog
index 0e631764b..58fdd7991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-24  Alexandre Duret-Lutz  <adl@src.lip6.fr>
+
+	* m4/devel.m4: Fix quoting and simplify default setting of
+	enable_devel.
+
 2003-11-21  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
 	* AUTHORS: New file.
diff --git a/m4/devel.m4 b/m4/devel.m4
index cb501c020..fee3fc150 100644
--- a/m4/devel.m4
+++ b/m4/devel.m4
@@ -5,12 +5,10 @@ AC_DEFUN([adl_ENABLE_DEVEL],
 
  # Turn on devel options for development version, unless
  # explicitely turned off.
- if test -z "$enable_devel"; then
-   case $VERSION in
-     *[abcdefghijklmnopqrstuvwxyz])
-       enable_devel=yes ;;
-   esac
- fi
+ case $VERSION in
+   *[[abcdefghijklmnopqrstuvwxyz]])
+     enable_devel=${enable_devel-yes} ;;
+ esac
 
  if test x"$enable_devel" = xyes; then
    enable_debug=${enable_debug-yes}