diff options
| -rw-r--r-- | lib/libXft/aclocal.m4 | 20 | ||||
| -rw-r--r-- | lib/libXft/configure | 43 |
2 files changed, 52 insertions, 11 deletions
diff --git a/lib/libXft/aclocal.m4 b/lib/libXft/aclocal.m4 index e237be1fa..5c281f9e7 100644 --- a/lib/libXft/aclocal.m4 +++ b/lib/libXft/aclocal.m4 @@ -7427,7 +7427,8 @@ dnl # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -7440,5 +7441,22 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) diff --git a/lib/libXft/configure b/lib/libXft/configure index d9ae930b8..b2453bb95 100644 --- a/lib/libXft/configure +++ b/lib/libXft/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libXft 2.1.11. +# Generated by GNU Autoconf 2.59 for libXft 2.1.12. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXft' PACKAGE_TARNAME='libXft' -PACKAGE_VERSION='2.1.11' -PACKAGE_STRING='libXft 2.1.11' +PACKAGE_VERSION='2.1.12' +PACKAGE_STRING='libXft 2.1.12' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -981,7 +981,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXft 2.1.11 to adapt to many kinds of systems. +\`configure' configures libXft 2.1.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1051,7 +1051,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXft 2.1.11:";; + short | recursive ) echo "Configuration of libXft 2.1.12:";; esac cat <<\_ACEOF @@ -1209,7 +1209,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libXft configure 2.1.11 +libXft configure 2.1.12 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1223,7 +1223,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXft $as_me 2.1.11, which was +It was created by libXft $as_me 2.1.12, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1867,7 +1867,7 @@ fi # Define the identity of the package. PACKAGE='libXft' - VERSION='2.1.11' + VERSION='2.1.12' cat >>confdefs.h <<_ACEOF @@ -19782,6 +19782,29 @@ fi; echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile xft.pc xft-config src/Makefile man/Makefile man/xft-config.1 man/Xft.3" cat >confcache <<\_ACEOF @@ -20174,7 +20197,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libXft $as_me 2.1.11, which was +This file was extended by libXft $as_me 2.1.12, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20237,7 +20260,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libXft config.status 2.1.11 +libXft config.status 2.1.12 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |