diff --git a/ChangeLog b/ChangeLog
index 99f436d5da..474e950c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-25  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: fixed the --without-aa option I added lately.
+
 2003-07-24  Maurits Rijk <lpeek.mrijk@consunet.nl>
 
 	* libgimp/gimpmiscui.c (gimp_fixme_preview_do_row): minor optimisations
@@ -29,7 +33,6 @@
 	Selection" and added "Edit/Stroke Active Path". Added some missing
 	mnemonics to the "Edit" menu.
 
->>>>>>> 1.6017
 2003-07-24  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimptexttool.c (gimp_text_tool_create_vectors): set
diff --git a/configure.in b/configure.in
index b618189200..ab77956d2d 100644
--- a/configure.in
+++ b/configure.in
@@ -852,7 +852,7 @@ fi
 
 
 AC_ARG_WITH(aa,  [  --without-aa           do not build the AA plug-in])
-if x$with_aa != xno test -z "$LIBAA"; then
+if test x$with_aa != xno && test -z "$LIBAA"; then
   AC_CHECK_LIB(aa, aa_printf,
     [AC_CHECK_HEADER(aalib.h,
       AA='aa'; LIBAA='-laa',