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')

Added NOCONFIGURE check to autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9c2f4f6..f5164d8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,7 @@
 #! /bin/sh
+
 autoreconf -v --install
-./configure "$@"
+
+if test -z "$NOCONFIGURE"; then
+    ./configure "$@"
+fi

diff --git a/configure.ac b/configure.ac
index 2655d74..7cabddd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_INIT([intel_driver], [intel_driver_version], [haihao.xiang@intel.com],
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 INTEL_DRIVER_MAJOR_VERSION=intel_driver_major_version
 INTEL_DRIVER_MINOR_VERSION=intel_driver_minor_version

diff --git a/src/Makefile.am b/src/Makefile.am
index cbe0795..4573557 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@
 
 SUBDIRS = shaders
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -DPTHREADS              \
        $(DRM_CFLAGS)           \
        $(LIBVA_DEPS_CFLAGS)    \