diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0ccad46..7aca66d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,22 +26,30 @@ AC_INIT(bitmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_CONFIG_HEADER(config.h) AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL +XORG_CWARNFLAGS + AC_CHECK_FUNC([mkstemp], - AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.])) + AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.])) # bmtoa checks for packages PKG_CHECK_MODULES(BMTOA, x11 xmu) +BMTOA_CFLAGS="$CWARNFLAGS $BMTOA_CFLAGS" AC_SUBST(BMTOA_CFLAGS) AC_SUBST(BMTOA_LIBS) # atobm checks for packages PKG_CHECK_MODULES(ATOBM, x11) +ATOBM_CFLAGS="$CWARNFLAGS $ATOBM_CFLAGS" AC_SUBST(ATOBM_CFLAGS) AC_SUBST(ATOBM_LIBS) @@ -49,19 +57,22 @@ AC_SUBST(ATOBM_LIBS) PKG_CHECK_MODULES(BITMAP, xaw7) PKG_CHECK_MODULES(XBITMAPS, xbitmaps) -BITMAP_CFLAGS="$BITMAP_CFLAGS $XBITMAPS_CFLAGS" +BITMAP_CFLAGS="$CWARNFLAGS $BITMAP_CFLAGS $XBITMAPS_CFLAGS" BITMAP_LIBS="$BITMAP_LIBS $XBITMAPS_LIBS" AC_SUBST(BITMAP_CFLAGS) AC_SUBST(BITMAP_LIBS) - - PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=<pathname>], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |