diff --git a/Makefile.am b/Makefile.am
index b7262ad5..9ca60a5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,12 +7,6 @@ profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \
 	src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/jabber.c \
 	src/main.c src/profanity.h src/prof_history.h src/util.c src/chat_log.c \
 	src/chat_log.h src/tinyurl.c src/tinyurl.h
-profanity_CFLAGS = -O3 -Werror -Wall -Wextra -Wno-unused-parameter \
-	-Wno-unused-but-set-variable -Wno-unused-result \
-	-Wno-missing-field-initializers \
-	-lstrophe -lxml2 -lexpat -lncurses -lcurl \
-	$(DEPS_CFLAGS) $(DEPS_LIBS) -lresolv \
-	$(NOTIFY_CFLAGS) $(NOTIFY_LIBS)
 
 TESTS = tests/testsuite
 check_PROGRAMS = tests/testsuite
diff --git a/configure.ac b/configure.ac
index bbed40a8..d666bb4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,23 @@ PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl])
 PKG_CHECK_MODULES([NOTIFY], [libnotify], [], 
     [AC_MSG_NOTICE([libnotify module not found])])
 
-CFLAGS="$CFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
-CPPFLAGS="$CPPFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
+AM_CFLAGS="-O3 -Werror -Wall -Wextra -Wno-unused-parameter "        
+AM_CFLAGS="$AM_CFLAGS -Wno-unused-but-set-variable -Wno-unused-result "
+AM_CFLAGS="$AM_CFLAGS -Wno-missing-field-initializers "
+AM_CFLAGS="$AM_CFLAGS -lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
+AM_CFLAGS="$AM_CFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
 
-AC_CHECK_HEADERS([libnotify/notify.h], [], 
-    [AC_MSG_NOTICE([libnotify not found, desktop notification option not included])])
+AM_CPPFLAGS="-lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
+AM_CPPFLAGS="$AM_CPPFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
+
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CPPFLAGS)
+
+#CFLAGS="$CFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
+#CPPFLAGS="$CPPFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
+
+#AC_CHECK_HEADERS([libnotify/notify.h], [], 
+#    [AC_MSG_NOTICE([libnotify not found, desktop notification option not included])])
 
 # Checks for typedefs, structures, and compiler characteristics.