summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-19 11:09:45 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-19 11:09:45 -0800
commit2348b1bd47584175fb100ccff7a01431f093f603 (patch)
tree8eeb135e2cd8be3a2ba7bb8385fe5b0b38ff8792
parentac06839eb3059a34779ffe420c65c5d2a832c4f9 (diff)
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSHEADmaster
Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Add missing AC_CONFIG_SRCDIR Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac14
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 8c8a202..2e327df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,22 +18,26 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-# Process this file with autoconf to produce a configure script
+dnl Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-sunbw2],
1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
-
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
@@ -41,8 +45,6 @@ XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
# Checks for programs.
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
AC_PROG_CC
AH_TOP([#include "xorg-server.h"])