diff --git a/configure.ac b/configure.ac
index d84a330..f26f4fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,7 @@ m4_define([GLIB_CHECK_COMPILE_WARNINGS],
 [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
 rm -f conftest.$ac_objext
 glib_ac_compile_save="$ac_compile"
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext'
+ac_compile='$CC -c conftest.$ac_ext'
 AS_IF([_AC_EVAL_STDERR($ac_compile) &&
          AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])],
       [$2],
diff --git a/pw3270.spec.in b/pw3270.spec.in
index eb20467..a0eafe1 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -118,7 +118,10 @@ Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 find . -exec touch {} \;
 aclocal
 autoconf
-./configure --enable-pic --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir}
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export FFLAGS="$RPM_OPT_FLAGS"
+%configure 
 
 %build
 make clean
--
libgit2 0.21.2