diff --git a/acinclude.m4 b/acinclude.m4
index f100dae..00d4f41 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -696,7 +696,7 @@ support])
       ]))
    AC_SUBST(LIBCRYPT)
    if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNTQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
+      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
    fi
    AC_CHECK_SOCKLEN_T
    AC_LANG_C
@@ -2329,7 +2329,7 @@ LIBS="$ac_save_LIBS"
 ])dnl
 if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE_UNTQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
+  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
   AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
 fi
@@ -2400,7 +2400,7 @@ dnl continue with a warning (the user will get no jpeg support in khtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
+  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
     AC_MSG_WARN([
@@ -2489,7 +2489,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if test ! "$ac_cv_lib_z" = no; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
+  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
   LIBZ="$ac_cv_lib_z"
   AC_SUBST(LIBZ)
   AC_MSG_RESULT($ac_cv_lib_z)
@@ -2540,7 +2540,7 @@ if test "$kde_cv_libtiff_$1" = "no"; then
 else
     LIBTIFF="$kde_cv_libtiff_$1"
     AC_MSG_RESULT(yes)
-    AC_DEFINE_UNTQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
+    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
     $2
 fi
 
@@ -2592,7 +2592,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
+  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
   LIBPNG="$ac_cv_lib_png"
   AC_SUBST(LIBPNG)
   AC_MSG_RESULT($ac_cv_lib_png)
@@ -2630,7 +2630,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-  AC_DEFINE_UNTQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
+  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
   LIB_JASPER="$ac_cv_jasper"
   AC_MSG_RESULT($ac_cv_jasper)
 else
@@ -2642,7 +2642,7 @@ AC_SUBST(LIB_JASPER)
 
 AC_DEFUN(AC_CHECK_BOOL,
 [
-  AC_DEFINE_UNTQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
+  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
 ])
 
 AC_DEFUN(AC_CHECK_GNU_EXTENSIONS,
@@ -2669,7 +2669,7 @@ fi
 
 AC_MSG_RESULT($ac_cv_gnu_extensions)
 if test "$ac_cv_gnu_extensions" = "yes"; then
-  AC_DEFINE_UNTQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
+  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
 fi
 ])
 
@@ -3026,7 +3026,7 @@ AC_DEFUN(KDE_CHECK_LIB64,
             libdir="$libdir${kdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNTQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
         AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
     fi
 ])
@@ -3107,10 +3107,10 @@ getsockname(0,(struct sockaddr*)0, &a);
 
   AC_MSG_RESULT($ac_cv_socklen_t)
   if test "$ac_cv_socklen_t" != "socklen_t"; then
-    AC_DEFINE_UNTQUOTED(socklen_t, $ac_cv_socklen_t,
+    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
         [Define the real type of socklen_t])
   fi
-  AC_DEFINE_UNTQUOTED(ksize_t, socklen_t, [Compatibility define])
+  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
 
 ])
 
@@ -3618,7 +3618,7 @@ You may want to enforce it by using --with-pam.])
     ])
     if test -n "$$3_PAM_SERVICE"; then
       AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-      AC_DEFINE_UNTQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
+      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
     fi
     AC_SUBST($3_PAM_SERVICE)
 ])
@@ -3746,11 +3746,11 @@ if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
 fi
 
 if test "$ac_cv_have_dlfcn" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
+  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
 fi
 
 if test "$ac_cv_have_shload" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
+  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
 fi
 
 if test "$enable_dlopen" = no ; then
@@ -3769,7 +3769,7 @@ AC_MSG_CHECKING([dynamic loading])
 eval "`egrep '^build_libtool_libs=' libtool`"
 if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
   dynamic_loading=yes
-  AC_DEFINE_UNTQUOTED(HAVE_DYNAMIC_LOADING)
+  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
 else
   dynamic_loading=no
 fi
@@ -4245,7 +4245,7 @@ using namespace std;
    AC_MSG_RESULT($kde_cv_stl_type_sgi)
 
    if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNTQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
+	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
    fi
 ])
 
@@ -4267,7 +4267,7 @@ using namespace std;
    AC_MSG_RESULT($kde_cv_stl_type_hp)
 
    if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNTQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
+	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
    fi
 ])
 
@@ -4323,7 +4323,7 @@ AC_LANG_RESTORE
 if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
   LIBTQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
   AC_MSG_RESULT(yes)
-  AC_DEFINE_UNTQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available])
+  AC_DEFINE_UNQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available])
   AC_SUBST(LIBTQIMGIO)
 else
   AC_MSG_RESULT(not found)
@@ -4383,7 +4383,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE,
     ])
 
     if test "$kde_cv_utmp_file" != "no"; then
-	AC_DEFINE_UNTQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
+	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
 	$1
 	AC_MSG_RESULT($kde_cv_utmp_file)
     else
@@ -4495,7 +4495,7 @@ AC_LANG_RESTORE
 ])
 AC_MSG_RESULT($ac_cv_have_s_issock)
 if test "$ac_cv_have_s_issock" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
+  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
 fi
 
 AH_VERBATIM(_ISSOCK,
@@ -4544,7 +4544,7 @@ rm conftest.*
 
 ])
 AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNTQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
+AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
 ])
 
 AC_DEFUN(KDE_CHECK_HEADER,
@@ -4911,12 +4911,12 @@ if test "x$kde_java_bindir" != "xno"; then
     JAVAC=$kde_java_bindir/javac
     JAVAH=$kde_java_bindir/javah
     JAR=$kde_java_bindir/jar
-    AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
     JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
     AC_MSG_RESULT([java JDK in $kde_java_bindir])
 
   else
-      AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
       AC_MSG_RESULT([java JRE in $kde_java_bindir])
   fi
 else # no
diff --git a/aclocal.m4 b/aclocal.m4
index a6ec6f4..d52450f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -708,7 +708,7 @@ support])
       ]))
    AC_SUBST(LIBCRYPT)
    if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNTQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
+      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
    fi
    AC_CHECK_SOCKLEN_T
    AC_LANG_C
@@ -2341,7 +2341,7 @@ LIBS="$ac_save_LIBS"
 ])dnl
 if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE_UNTQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
+  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
   AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
 fi
@@ -2412,7 +2412,7 @@ dnl continue with a warning (the user will get no jpeg support in khtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
+  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
     AC_MSG_WARN([
@@ -2501,7 +2501,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if test ! "$ac_cv_lib_z" = no; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
+  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
   LIBZ="$ac_cv_lib_z"
   AC_SUBST(LIBZ)
   AC_MSG_RESULT($ac_cv_lib_z)
@@ -2552,7 +2552,7 @@ if test "$kde_cv_libtiff_$1" = "no"; then
 else
     LIBTIFF="$kde_cv_libtiff_$1"
     AC_MSG_RESULT(yes)
-    AC_DEFINE_UNTQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
+    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
     $2
 fi
 
@@ -2604,7 +2604,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNTQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
+  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
   LIBPNG="$ac_cv_lib_png"
   AC_SUBST(LIBPNG)
   AC_MSG_RESULT($ac_cv_lib_png)
@@ -2642,7 +2642,7 @@ LIBS="$kde_save_LIBS"
 CFLAGS="$kde_save_CFLAGS"
 ])dnl
 if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-  AC_DEFINE_UNTQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
+  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
   LIB_JASPER="$ac_cv_jasper"
   AC_MSG_RESULT($ac_cv_jasper)
 else
@@ -2654,7 +2654,7 @@ AC_SUBST(LIB_JASPER)
 
 AC_DEFUN(AC_CHECK_BOOL,
 [
-  AC_DEFINE_UNTQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
+  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
 ])
 
 AC_DEFUN(AC_CHECK_GNU_EXTENSIONS,
@@ -2681,7 +2681,7 @@ fi
 
 AC_MSG_RESULT($ac_cv_gnu_extensions)
 if test "$ac_cv_gnu_extensions" = "yes"; then
-  AC_DEFINE_UNTQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
+  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
 fi
 ])
 
@@ -3038,7 +3038,7 @@ AC_DEFUN(KDE_CHECK_LIB64,
             libdir="$libdir${kdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNTQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
         AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
     fi
 ])
@@ -3119,10 +3119,10 @@ getsockname(0,(struct sockaddr*)0, &a);
 
   AC_MSG_RESULT($ac_cv_socklen_t)
   if test "$ac_cv_socklen_t" != "socklen_t"; then
-    AC_DEFINE_UNTQUOTED(socklen_t, $ac_cv_socklen_t,
+    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
         [Define the real type of socklen_t])
   fi
-  AC_DEFINE_UNTQUOTED(ksize_t, socklen_t, [Compatibility define])
+  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
 
 ])
 
@@ -3630,7 +3630,7 @@ You may want to enforce it by using --with-pam.])
     ])
     if test -n "$$3_PAM_SERVICE"; then
       AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-      AC_DEFINE_UNTQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
+      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
     fi
     AC_SUBST($3_PAM_SERVICE)
 ])
@@ -3758,11 +3758,11 @@ if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
 fi
 
 if test "$ac_cv_have_dlfcn" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
+  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
 fi
 
 if test "$ac_cv_have_shload" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
+  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
 fi
 
 if test "$enable_dlopen" = no ; then
@@ -3781,7 +3781,7 @@ AC_MSG_CHECKING([dynamic loading])
 eval "`egrep '^build_libtool_libs=' libtool`"
 if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
   dynamic_loading=yes
-  AC_DEFINE_UNTQUOTED(HAVE_DYNAMIC_LOADING)
+  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
 else
   dynamic_loading=no
 fi
@@ -4257,7 +4257,7 @@ using namespace std;
    AC_MSG_RESULT($kde_cv_stl_type_sgi)
 
    if test "$kde_cv_stl_type_sgi" = "yes"; then
-	AC_DEFINE_UNTQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
+	AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
    fi
 ])
 
@@ -4279,7 +4279,7 @@ using namespace std;
    AC_MSG_RESULT($kde_cv_stl_type_hp)
 
    if test "$kde_cv_stl_type_hp" = "yes"; then
-	AC_DEFINE_UNTQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
+	AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP])
    fi
 ])
 
@@ -4335,7 +4335,7 @@ AC_LANG_RESTORE
 if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
   LIBTQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
   AC_MSG_RESULT(yes)
-  AC_DEFINE_UNTQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available])
+  AC_DEFINE_UNQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available])
   AC_SUBST(LIBTQIMGIO)
 else
   AC_MSG_RESULT(not found)
@@ -4395,7 +4395,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE,
     ])
 
     if test "$kde_cv_utmp_file" != "no"; then
-	AC_DEFINE_UNTQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
+	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
 	$1
 	AC_MSG_RESULT($kde_cv_utmp_file)
     else
@@ -4507,7 +4507,7 @@ AC_LANG_RESTORE
 ])
 AC_MSG_RESULT($ac_cv_have_s_issock)
 if test "$ac_cv_have_s_issock" = "yes"; then
-  AC_DEFINE_UNTQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
+  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
 fi
 
 AH_VERBATIM(_ISSOCK,
@@ -4556,7 +4556,7 @@ rm conftest.*
 
 ])
 AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNTQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
+AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
 ])
 
 AC_DEFUN(KDE_CHECK_HEADER,
@@ -4923,12 +4923,12 @@ if test "x$kde_java_bindir" != "xno"; then
     JAVAC=$kde_java_bindir/javac
     JAVAH=$kde_java_bindir/javah
     JAR=$kde_java_bindir/jar
-    AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
     JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
     AC_MSG_RESULT([java JDK in $kde_java_bindir])
 
   else
-      AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
       AC_MSG_RESULT([java JRE in $kde_java_bindir])
   fi
 else # no
@@ -10922,8 +10922,8 @@ m4_ifval([$2],
  AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNTQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNTQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl