From 272e57235cd60a2e65ac8258d96a02eb3939b687 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 25 Mar 2011 10:41:05 +0000 Subject: git update until 25 Mar 2011 xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4 --- libXmu/configure.ac | 75 +++++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 49 deletions(-) (limited to 'libXmu/configure.ac') diff --git a/libXmu/configure.ac b/libXmu/configure.ac index f521572e4..880fc5a2e 100644 --- a/libXmu/configure.ac +++ b/libXmu/configure.ac @@ -1,69 +1,46 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.57) - -AC_INIT([libXmu], - 1.0.5, - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXmu) - +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([libXmu], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_CONFIG_HEADERS([config.h]) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT -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]) - - -# Checks for programs. +# Initialize libtool AC_PROG_LIBTOOL -AC_PROG_CC + +# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) -# Checks for pkg-config packages +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) -AC_SUBST(XMU_CFLAGS) -AC_SUBST(XMU_LIBS) - PKG_CHECK_MODULES(XMUU, x11) -AC_SUBST(XMUU_CFLAGS) -AC_SUBST(XMUU_LIBS) # CvtStdSel.c needs to know which network transports to build hostname # conversion routines for XTRANS_CONNECTION_FLAGS -# -# Assume that we have sprintf. If a system shows up -# that doesn't, we will deal with it at that point. -# -# The way to deal with it is: -# -# 1. Add a test for sprintf it here in configure.ac -# that sets or unsets HAS_SNPRINTF as appropriate -# -# 2. add a copy of xc/lib/misc/snprintf.c -# -# The source file in question is Lower.c -# - -AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()]) -AC_SUBST(HAS_SNPRINTF) - -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xmu]) LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` AC_SUBST(LINTLIBUU) -AC_OUTPUT([Makefile - include/Makefile - src/Makefile - xmu.pc - xmuu.pc]) +AC_CONFIG_FILES([Makefile + doc/Makefile + include/Makefile + src/Makefile + xmu.pc + xmuu.pc]) +AC_OUTPUT -- cgit v1.2.3