diff --git a/configure.ac b/configure.ac
index 0d5d3b5..8510c52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,12 +60,6 @@ dnl ---------------------------------------------------------------------------
 dnl Initialize defaults
 dnl ---------------------------------------------------------------------------
 
-DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
-RLS_CFLAGS="-DNDEBUG=1"
-PLUGINS=""
-APP_RESOURCES=""
-APP_LDFLAGS=""
-DLL_LDFLAGS="-shared"
 CLIENT_LDFLAGS=""
 CLIENT_LIBS=""
 CLIENT_TARGETS="devel"
@@ -450,6 +444,8 @@ dnl ---------------------------------------------------------------------------
 dnl Output the generated config.status script.
 dnl ---------------------------------------------------------------------------
 AC_SUBST(BASEDIR,$ac_pwd)
+CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H"
 
 AC_OUTPUT
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 7a879e5..a6e5b25 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -102,7 +102,6 @@ CFLAGS= \
 	-I$(BASEDIR)/server/src/include \
 	-I$(BASEDIR)/common/src/include \
 	-DBUILD_DATE=`date +%Y%m%d` \
-	@LIB3270_CFLAGS@ \
 	@V3270_CFLAGS@ \
 	@GTK_CFLAGS@ \
 	@GLIB_CFLAGS@ \
@@ -114,7 +113,6 @@ LIBS= \
 	@LIBICONV@ \
 	@INTL_LIBS@ \
 	@V3270_LIBS@ \
-	@LIB3270_LIBS@ \
 	@GTK_LIBS@ \
 	@GLIB_LIBS@ \
 	@DBUS_LIBS@ \
--
libgit2 0.21.2