diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-26 14:06:19 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-26 14:06:19 +0000 |
| commit | 1e3c1fcdaab91d7c428f33ebba72c4eb178348f7 (patch) | |
| tree | 303729560cafc4c4a2aaf67bbd05b7d24d6ea9ba /app/bitmap/configure.ac | |
| parent | 050a65b29195c30b3a0242f042e5f8a106d08725 (diff) | |
Update to bitmap 1.0.4
Diffstat (limited to 'app/bitmap/configure.ac')
| -rw-r--r-- | app/bitmap/configure.ac | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/app/bitmap/configure.ac b/app/bitmap/configure.ac index 87df9f3e1..e4b22910b 100644 --- a/app/bitmap/configure.ac +++ b/app/bitmap/configure.ac @@ -22,17 +22,24 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(bitmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],bitmap) +AC_INIT(bitmap,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],bitmap) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + AM_CONFIG_HEADER(config.h) AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL +XORG_DEFAULT_OPTIONS + 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) @@ -45,7 +52,7 @@ AC_SUBST(ATOBM_CFLAGS) AC_SUBST(ATOBM_LIBS) # bitmap checks for packages -XAW_CHECK_XPRINT_SUPPORT(BITMAP) +PKG_CHECK_MODULES(BITMAP, xaw7) PKG_CHECK_MODULES(XBITMAPS, xbitmaps) BITMAP_CFLAGS="$BITMAP_CFLAGS $XBITMAPS_CFLAGS" @@ -54,13 +61,12 @@ 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 - AC_OUTPUT([Makefile]) |