--- configure.orig	Mon Jun  4 09:02:09 2001
+++ configure	Tue May 31 16:22:07 2005
@@ -1323,7 +1323,7 @@
 
 GNAPSTER_INCLUDES=""
 GNAPSTER_LDADD=""
-CFLAGS="-g"
+#CFLAGS="-g"
 
 
 if test "$gnome" = yes; then
@@ -1370,8 +1370,8 @@
     echo "$ac_t""GNOME not found, building without it." 1>&6
     GUI_LIBS="$GUI_LIBS $GTK_LIBS"
     GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
-    GNAPSTER_INCLUDES="`gtk-config --cflags`"
-    GNAPSTER_LDADD="`gtk-config --libs`"
+    GNAPSTER_INCLUDES="`$GTK_CONFIG --cflags`"
+    GNAPSTER_LDADD="`$GTK_CONFIG --libs`"
   else
     echo "$ac_t""ok" 1>&6
     
@@ -1693,8 +1693,8 @@
     GNAPSTER_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS"
   fi
 else   
-  GNAPSTER_INCLUDES="`gtk-config --cflags`"
-  GNAPSTER_LDADD="`gtk-config --libs`"
+  GNAPSTER_INCLUDES="`$GTK_CONFIG --cflags`"
+  GNAPSTER_LDADD="`$GTK_CONFIG --libs`"
 fi
 
 
@@ -2927,7 +2927,7 @@
 LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$ac_aux_dir/ltconfig --no-reexec \
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }