diff --git a/Makefile.init.in b/Makefile.init.in
index 8a01b215ce..0e448f4802 100644
--- a/Makefile.init.in
+++ b/Makefile.init.in
@@ -5,6 +5,7 @@
 export PATH := @GUILE_BIN@:@ABSOLUTE_TOP_SRCDIR@/lib/g-wrap-install/bin/:${PATH}
 
 srcdir  = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH   = @srcdir@
 
 prefix=@prefix@
@@ -23,7 +24,7 @@ sysconfdir=@sysconfdir@
 includedir=@includedir@
 
 CC           = @CC@
-C++          = @C++@
+CXX          = @CXX@
 CFLAGS       = @CFLAGS@
 CPPFLAGS     = @CPPFLAGS@
 INSTALL      = @INSTALL@
diff --git a/configure.in b/configure.in
index a00addabca..701c450401 100644
--- a/configure.in
+++ b/configure.in
@@ -225,7 +225,7 @@ AC_CHECK_LIB(png, png_read_image,
 
 AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
         AC_DEFINE(HAVE_XPM,1) X_LIBS="-lXpm $X_LIBS",
-        AC_DEFINE(HAVE_XPM,0), -L$x_libraries -lX11) 
+        AC_DEFINE(HAVE_XPM,0), $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS) 
 
 # Don't build the xmhtml source if user already has it installed...
 # this is ugly, there must be a nicer way of setting this up ...
@@ -414,7 +414,7 @@ AC_SUBST(GNC_RUNTIME_CONFIGDIR)
 GTKSHEET_DIR="gtksheet"
 AC_SUBST(GTKSHEET_DIR)
 
-CFLAGS="${CFLAGS} -Werror -Wno-unused"
+#CFLAGS="${CFLAGS} -Werror -Wno-unused"
 
 ABSOLUTE_TOP_SRCDIR=`pwd`
 AC_SUBST(ABSOLUTE_TOP_SRCDIR)
diff --git a/src/swig/perl5/Makefile.in b/src/swig/perl5/Makefile.in
index 56c3a84dd1..0524c2ab65 100644
--- a/src/swig/perl5/Makefile.in
+++ b/src/swig/perl5/Makefile.in
@@ -33,8 +33,7 @@ INCLPATH = \
 
 # set -Dbool=char because the perl headers need this
 # use -fpic so that we can create loadable module
-CFLAGS := @CFLAGS@  ${INCLPATH} -Dbool=char -fpic -Wno-unused
-CFLAGS := $(filter-out -Werror,${CFLAGS})
+CFLAGS := @CFLAGS@  ${INCLPATH} -Dbool=char #-fpic -Wno-unused
 
 LDFLAGS  = @LDFLAGS@