diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /xorg-server/fonts.src/font-util/configure.ac | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/fonts.src/font-util/configure.ac')
| -rw-r--r-- | xorg-server/fonts.src/font-util/configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/fonts.src/font-util/configure.ac b/xorg-server/fonts.src/font-util/configure.ac index 471a527f9..3a941d2fe 100644 --- a/xorg-server/fonts.src/font-util/configure.ac +++ b/xorg-server/fonts.src/font-util/configure.ac @@ -21,9 +21,14 @@ dnl CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([font-util], [1.2.0], +AC_INIT([font-util], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-util]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -31,23 +36,18 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) -AM_CONFIG_HEADER(config.h) - XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL - AC_MSG_CHECKING([for root directory for font files]) fontrootdir='${datadir}/fonts/X11' -AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR], +AC_ARG_WITH(fontrootdir, [AS_HELP_STRING([--with-fontrootdir=DIR], [Path to parent of font subdirectories [DATADIR/fonts/X11]])], [fontrootdir="${withval}"]) AC_SUBST(fontrootdir) AC_MSG_RESULT([${fontrootdir}]) mapdir='${fontrootdir}/util' -AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR], +AC_ARG_WITH(mapdir, [AS_HELP_STRING([--with-mapdir=DIR], [Path to install font maps [FONTROOTDIR/util]])], [mapdir="${withval}"]) MAPDIR="$mapdir" |