summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@herrb.eu>2014-07-13 16:41:41 +0200
committerMatthieu Herrb <matthieu@herrb.eu>2014-07-13 16:41:41 +0200
commit7ce8a10b8102e02e822b99d5a2de14e2c31052e7 (patch)
tree152ba1aa942adccab498e438f61ca0e042dc9f78
parent16ac29883cb80053fb0b973166a3f664cae1fa44 (diff)
Sync configure.ac and src/Makefile.am with X.Org templates
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-rw-r--r--configure.ac23
-rw-r--r--src/Makefile.am2
2 files changed, 14 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index accc4b0..136fd56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,13 +28,7 @@ AC_INIT([xf86-video-wsfb],
[xf86-video-wsfb])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
-
-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
@@ -45,6 +39,12 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
@@ -64,15 +64,18 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
# Checks for libraries.
+# Checks for header files.
+AC_HEADER_STDC
AC_SUBST([moduledir])
DRIVER_NAME=wsfb
AC_SUBST([DRIVER_NAME])
+AC_SUBST([moduledir])
AC_CONFIG_FILES([
- Makefile
- src/Makefile
- man/Makefile
+ Makefile
+ src/Makefile
+ man/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 0479268..60eea79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
wsfb_drv_la_LTLIBRARIES = wsfb_drv.la
wsfb_drv_la_LDFLAGS = -module -avoid-version
wsfb_drv_ladir = @moduledir@/drivers