Automake 1.13 fixups

error: 'AM_CONFIG_HEADER': this macro is obsolete.
  You should use the 'AC_CONFIG_HEADERS' macro instead.

warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

changed NO_CONFIGURE to NOCONFIGURE to be consistent with other packages

12 files changed, 13 insertions, 13 deletions

diff --git a/autogen.sh b/autogen.sh
index ab04e1d..af7d03c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,6 +46,6 @@ fi
 
 cd "$olddir"
 
-if test -z "$NO_CONFIGURE"; then
+if test -z "$NOCONFIGURE"; then
     $srcdir/configure "$@" && echo "Now type 'make' to compile $PROJECT."
 fi
diff --git a/configure.ac b/configure.ac
index 257964d..6d97f8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
index 69364c2..9c3255a 100644
--- a/dummy_drv_video/Makefile.am
+++ b/dummy_drv_video/Makefile.am
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 if BUILD_DUMMY_DRIVER
 dummy_drv_video_la_LTLIBRARIES	= dummy_drv_video.la
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index 6fffd31..e84bf43 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -22,7 +22,7 @@
 
 bin_PROGRAMS = mpeg2vldemo loadjpeg
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/test/common		\
 	$(NULL)
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index db7f13c..8947850 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -25,7 +25,7 @@ if USE_X11
 bin_PROGRAMS += h264encode
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/va		\
 	$(NULL)
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index 15b3348..8ffe255 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -22,7 +22,7 @@
 
 bin_PROGRAMS = putsurface
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	$(NULL)
diff --git a/va/Makefile.am b/va/Makefile.am
index a3bfe06..4040441 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -22,7 +22,7 @@
 
 SUBDIRS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
 
diff --git a/va/drm/Makefile.am b/va/drm/Makefile.am
index b860ff5..c7ba3f6 100644
--- a/va/drm/Makefile.am
+++ b/va/drm/Makefile.am
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/va	\
@@ -45,7 +45,7 @@ source_h_priv = \
 
 if USE_X11
 source_c			+= va_drm_auth_x11.c
-INCLUDES			+= $(X11_CFLAGS)
+AM_CPPFLAGS			+= $(X11_CFLAGS)
 endif
 
 noinst_LTLIBRARIES		= libva_drm.la
diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am
index 7f3f954..aee4975 100644
--- a/va/egl/Makefile.am
+++ b/va/egl/Makefile.am
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/va	\
diff --git a/va/glx/Makefile.am b/va/glx/Makefile.am
index 79d8594..8ff8ae9 100644
--- a/va/glx/Makefile.am
+++ b/va/glx/Makefile.am
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/va	\
diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
index a9f9546..ca6c594 100644
--- a/va/wayland/Makefile.am
+++ b/va/wayland/Makefile.am
@@ -22,7 +22,7 @@
 
 SUBDIRS = protocol
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/va	\
diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index c38cd58..0853016 100644
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/va	\