diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 7bee2c6..41a81aa 100644 --- a/configure.ac +++ b/configure.ac @@ -26,38 +26,29 @@ AC_INIT(xvidtune,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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 AC_PROG_INSTALL -AC_PROG_CPP -AC_PATH_PROGS(RAWCPP, [cpp], [$(CPP)], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XAW, xaw7) -PKG_CHECK_MODULES(XVIDTUNE, xxf86vm) - -XVIDTUNE_CFLAGS="$XVIDTUNE_CFLAGS $XAW_CFLAGS" -XVIDTUNE_LIBS="$XVIDTUNE_LIBS $XAW_LIBS" - +PKG_CHECK_MODULES(XVIDTUNE, xxf86vm xt xaw7) +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}"]) +XVIDTUNE_CFLAGS="$CWARNFLAGS $XVIDTUNE_CFLAGS" +XVIDTUNE_LIBS="$XVIDTUNE_LIBS" AC_SUBST(XVIDTUNE_CFLAGS) AC_SUBST(XVIDTUNE_LIBS) - -AC_ARG_WITH(vendor-name, - AS_HELP_STRING([--with-vendor-name=VENDOR], - [Vendor name for disclaimer statement]), - [ VENDOR_NAME="$withval" ], - [ VENDOR_NAME="The X.Org Foundation" ]) -AC_SUBST([VENDOR_NAME]) - -PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |