diff --git a/configure.ac b/configure.ac
index 2f58a8554..35f307ea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,10 +99,14 @@ AC_ARG_WITH(gdal-config,
   PROG="gdal-config";
   AC_PATH_PROG(GDAL_CONFIG, $PROG, "", $PATH)
 ])
-GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
-GDAL_LIBS=`$GDAL_CONFIG --libs`
-AC_SUBST(GDAL_CFLAGS)
-AC_SUBST(GDAL_LIBS)
+
+if test "x$GDAL_CONFIG" != "x"; then
+  GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
+  GDAL_LIBS=`$GDAL_CONFIG --libs`
+  AC_SUBST(GDAL_CFLAGS)
+  AC_SUBST(GDAL_LIBS)
+fi
+AM_CONDITIONAL(HAVE_GDAL, test "x$GDAL_CONFIG" != "x")
 
 
 AX_CHECK_TIFF
diff --git a/include/mapnik/Makefile.am b/include/mapnik/Makefile.am
index 70654663d..2b4fae391 100644
--- a/include/mapnik/Makefile.am
+++ b/include/mapnik/Makefile.am
@@ -49,6 +49,7 @@ libmapnik_HEADERS = \
 	filter_parser_ast.hpp \
 	filter_visitor.hpp \
 	font_engine_freetype.hpp \
+	font_set.hpp \
 	gamma.hpp \
 	geometry.hpp \
 	geom_util.hpp \
diff --git a/plugins/input/gdal/Makefile.am b/plugins/input/gdal/Makefile.am
index c7ef438d4..b59fb72b1 100644
--- a/plugins/input/gdal/Makefile.am
+++ b/plugins/input/gdal/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_GDAL
 
 pkglib_LTLIBRARIES = \
 	gdal.la
@@ -18,4 +19,6 @@ gdal_la_LDFLAGS = \
 	-avoid-version \
 	-shrext .input
 
+endif
+
 ## File created by the gnome-build tools
diff --git a/src/Makefile.am b/src/Makefile.am
index c870b9acb..428dfcb51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ libmapnik_la_SOURCES = \
 	envelope.cpp \
 	filter_factory.cpp \
 	font_engine_freetype.cpp \
+	font_set.cpp \
 	graphics.cpp \
 	image_reader.cpp \
 	image_util.cpp \