diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXpm/configure.ac | |
parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXpm/configure.ac')
-rw-r--r-- | libXpm/configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libXpm/configure.ac b/libXpm/configure.ac index 057c056d6..ba7e3b484 100644 --- a/libXpm/configure.ac +++ b/libXpm/configure.ac @@ -1,12 +1,11 @@ + # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXpm], - [3.5.9], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [libXpm]) +AC_INIT([libXpm], [3.5.10], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXpm]) AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -26,7 +25,7 @@ AC_CHECK_FUNCS([strlcat]) # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XPM, xproto x11) -PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) +PKG_CHECK_MODULES(SXPM, x11 xt xext xextproto, build_sxpm=true, build_sxpm=false) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) # Internationalization & localization support @@ -44,7 +43,7 @@ else fi if test "x$USE_GETTEXT" = "xyes" ; then - AC_DEFINE([USE_GETTEXT], 1, + AC_DEFINE([USE_GETTEXT], 1, [Define to 1 if you want to use the gettext() function.]) fi AM_CONDITIONAL(USE_GETTEXT, test "x$USE_GETTEXT" = "xyes") @@ -62,6 +61,7 @@ fi AC_CONFIG_FILES([Makefile doc/Makefile include/Makefile + man/Makefile src/Makefile sxpm/Makefile cxpm/Makefile |