12 files changed, 12 insertions, 12 deletions
diff --git a/configure.in b/configure.ac
index 66f08249..6e5d8d90 100644
--- a/configure.in
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.60])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([configure.in])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])
diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
index 747d5de4..7c0eb686 100644
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c
 checksum_la_LDFLAGS = -avoid-version -module 
 checksum_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
diff --git a/plugins/doat/Makefile.am b/plugins/doat/Makefile.am
index 8be75450..5ed0ba7a 100644
--- a/plugins/doat/Makefile.am
+++ b/plugins/doat/Makefile.am
@@ -6,5 +6,5 @@ lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c
 doat_la_LDFLAGS = -avoid-version -module 
 doat_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
 
diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am
index 951af6cd..0f1189de 100644
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES = fishlim.la
 fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c
 fishlim_la_LDFLAGS = -avoid-version -module 
 fishlim_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am
index eefb785b..a8b3a297 100644
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -12,7 +12,7 @@ perl_la_LDFLAGS = -avoid-version -module
 perl_la_LIBADD = $(PERL_LDFLAGS)
 BUILT_SOURCES = xchat.pm.h irc.pm.h
 #CFLAGS = @CFLAGS@ -Wno-unused
-INCLUDES = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
 CLEANFILES = xchat.pm.h irc.pm.h
 xchat.pm.h irc.pm.h: lib/Xchat.pm lib/Xchat/Embed.pm \
 	lib/Xchat/List/Network.pm lib/Xchat/List/Network/Entry.pm \
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 89d5f15f..078db44b 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -6,5 +6,5 @@ lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
 python_la_LDFLAGS = -avoid-version -module 
 python_la_LIBADD = $(PY_LIBS)
-INCLUDES = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
 
diff --git a/plugins/sasl/Makefile.am b/plugins/sasl/Makefile.am
index d6f74797..0a9d169f 100644
--- a/plugins/sasl/Makefile.am
+++ b/plugins/sasl/Makefile.am
@@ -6,5 +6,5 @@ lib_LTLIBRARIES = sasl.la
 sasl_la_SOURCES = sasl.c
 sasl_la_LDFLAGS = -avoid-version -module 
 sasl_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
 
diff --git a/plugins/tcl/Makefile.am b/plugins/tcl/Makefile.am
index da2eb74b..aaf1b698 100644
--- a/plugins/tcl/Makefile.am
+++ b/plugins/tcl/Makefile.am
@@ -7,4 +7,4 @@ lib_LTLIBRARIES = tcl.la
 tcl_la_SOURCES = tclplugin.c
 tcl_la_LDFLAGS = -avoid-version -module 
 tcl_la_LIBADD = $(TCL_LIBS)
-INCLUDES = $(TCL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(TCL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 409aa324..289c3fca 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libxchatcommon.a
 
-INCLUDES = $(COMMON_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS)
 
 EXTRA_DIST = \
 	cfgfiles.h \
diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am
index 46940442..62728e28 100644
--- a/src/common/dbus/Makefile.am
+++ b/src/common/dbus/Makefile.am
@@ -19,7 +19,7 @@ BUILT_SOURCES =				\
 
 CLEANFILES = $(BUILT_SOURCES)
 
-INCLUDES = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
 
 noinst_PROGRAMS = example
 example_SOURCES = example.c 
diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am
index 868656b5..0136ca84 100644
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -2,7 +2,7 @@ localedir = $(datadir)/locale
 
 bin_PROGRAMS = hexchat
 
-INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
 
 hexchat_LDADD = ../common/libxchatcommon.a $(GUI_LIBS)
 
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 28d48060..fd0415ba 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = hexchat-text
 
 EXTRA_DIST = README 
 
-INCLUDES = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
 
 hexchat_text_LDADD = ../common/libxchatcommon.a $(COMMON_LIBS)
 hexchat_text_SOURCES = fe-text.c fe-text.h