configure.ac: Replace with one based on the dummy driver for more consistency

This also fixes a typo of DRIVR_NAME that existed in the previous version.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

1 files changed, 49 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index cc032a0..32e9ab0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,37 +1,43 @@
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice (including the next
-dnl paragraph) shall be included in all copies or substantial portions of the
-dnl Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-dnl
-dnl Author: Paulo Zanoni <pzanoni@mandriva.com>
-dnl
-
-AC_PREREQ([2.65])
-AC_INIT([xf86-video-nested], [0.1.0], [pzanoni@mandriva.com])
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror dist-bzip2])
+#  Copyright 2005 Adam Jackson.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation
+#  on the rights to use, copy, modify, merge, publish, distribute, sub
+#  license, and/or sell copies of the Software, and to permit persons to whom
+#  the Software is furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice (including the next
+#  paragraph) shall be included in all copies or substantial portions of the
+#  Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#  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
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xf86-video-nestedy],
+        [0.1.0],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+        [xf86-video-nested])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
-AC_PROG_CC
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.7 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.7)
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 XORG_DEFAULT_OPTIONS
 
 # Initialize libtool
@@ -44,13 +50,22 @@ AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
                              [ moduledir="$libdir/xorg/modules" ])
 AC_SUBST(moduledir)
 
-PKG_CHECK_MODULES(XORG, [xorg-server])
+
+# Store the list of server defined optional extensions in REQUIRED_MODULES
+#XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+
+# Obtain compiler/linker options for the driver dependencies
+PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+
+# Checks for libraries.
 PKG_CHECK_MODULES(X11, x11)
 PKG_CHECK_MODULES(XEXT, xext)
 
 DRIVER_NAME=nested
-AC_SUBST([DRIVR_NAME])
+AC_SUBST([DRIVER_NAME])
 
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([
+                Makefile
+                src/Makefile
+])
 AC_OUTPUT