--- dox/configure.orig	Sat Jul 18 10:39:17 1998
+++ dox/configure	Sun Jul 19 12:59:07 1998
@@ -595,12 +595,12 @@
 	exit
       fi
     fi
-    if test -f $D/gif_lib.h; then
+    if test -f $D/giflib/gif_lib.h; then
       if test $GIF -eq 0; then
         GIF=1
       else
         echo "WARNING! Multiple libGIF headers found on this system"
-	echo "Please remove multiple copies of gif_lib.h from the system and"
+	echo "Please remove multiple copies of giflib/gif_lib.h from the system and"
 	echo "recompile Imlib before proceeding to compile DOX for Enlightenment"
 	echo ""
 	echo "This may require you completely deleting ALL traces of this"
@@ -3358,7 +3358,7 @@
 done
 
 
-CPPFLAGS="$CPPFLAGS $X_CFLAGS -g"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 GX_LIBS="$X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
 
 echo $ac_n "checking for main in -lXtst""... $ac_c" 1>&6
--- src/configure.orig	Sat Jul 18 10:39:18 1998
+++ src/configure	Sun Jul 19 12:59:19 1998
@@ -595,12 +595,12 @@
 	exit
       fi
     fi
-    if test -f $D/gif_lib.h; then
+    if test -f $D/giflib/gif_lib.h; then
       if test $GIF -eq 0; then
         GIF=1
       else
         echo "WARNING! Multiple libGIF headers found on this system"
-	echo "Please remove multiple copies of gif_lib.h from the system and"
+	echo "Please remove multiple copies of giflib/gif_lib.h from the system and"
 	echo "recompile Imlib before proceeding to compile Enlightenment"
 	echo ""
 	echo "This may require you completely deleting ALL traces of this"
@@ -3391,7 +3391,7 @@
 done
 
 
-CPPFLAGS="$CPPFLAGS $X_CFLAGS -g"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 GX_LIBS="$X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
 
 echo $ac_n "checking for XTestFakeButtonEvent in -lXtst""... $ac_c" 1>&6
--- configedit/configure.orig	Tue Jul 21 12:31:18 1998
+++ configedit/configure	Tue Jul 21 13:49:36 1998
@@ -861,8 +861,8 @@
     sleep 10
   fi
 
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
+# Extract the first word of "perl5", so it can be a program name with args.
+set dummy perl5; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:868: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
