From 187231cbf7dedbf585974af340b9fd26c77446a6 Mon Sep 17 00:00:00 2001
From: Marc Lehmann <pcg@src.gnome.org>
Date: Sat, 27 Nov 1999 02:19:57 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog    | 1 -
 configure.in | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 828771371e..88fc4ae8c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,7 +49,6 @@ Fri Nov 26 12:25:42 CET 1999  Sven Neumann <sven@gimp.org>
 
 	* plug-ins/gap/gap_main.c: fixed a menu path.
 
->>>>>>> 1.1871
 Fri Nov 26 01:33:04 MET 1999  Sven Neumann <sven@gimp.org>
 
 	* app/histogram_tool.c: purely cosmetic change
diff --git a/configure.in b/configure.in
index 819bd18d66..d798d1b46b 100644
--- a/configure.in
+++ b/configure.in
@@ -564,7 +564,7 @@ if test "x$enable_perl" != xno; then
       sinclude(plug-ins/perl/configure.frag)
 
       dnl we ignore prefix
-      if test -n "$enable_perl" && test "$enable_perl" != xyes; then
+      if test -n "$enable_perl" && test "x$enable_perl" != xyes; then
          perl_prefix="PREFIX=$enable_perl"
       fi
       cat >plug-ins/perl/config.status <<EOF