aboutsummaryrefslogtreecommitdiff
path: root/libXaw/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-25 10:41:05 +0000
committermarha <marha@users.sourceforge.net>2011-03-25 10:41:05 +0000
commit272e57235cd60a2e65ac8258d96a02eb3939b687 (patch)
tree789d74bd6ec1cc468f1f81aab97d4e4dfdb2d5c5 /libXaw/configure.ac
parentb39f063f74bf0163eaf34db03134f226d18142ec (diff)
downloadvcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.gz
vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.bz2
vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.zip
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
Diffstat (limited to 'libXaw/configure.ac')
-rw-r--r--libXaw/configure.ac92
1 files changed, 32 insertions, 60 deletions
diff --git a/libXaw/configure.ac b/libXaw/configure.ac
index bd7b202aa..9c99e0366 100644
--- a/libXaw/configure.ac
+++ b/libXaw/configure.ac
@@ -1,54 +1,35 @@
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-
-AC_INIT([libXaw],
- 1.0.7,
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXaw)
-
-AM_INIT_AUTOMAKE([dist-bzip2])
-
-AM_CONFIG_HEADER(config.h)
-
-# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([libXaw], [1.0.9],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# 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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_AWK
-AC_PROG_SED
-
-AC_PATH_PROGS([GROFF], [groff], [none], [$PATH:/usr/gnu/bin])
-
-AC_MSG_CHECKING([whether to build documentation])
-AC_ARG_ENABLE(docs, AC_HELP_STRING([--enable-docs],
- [Enable building of Xaw documentation]),
- [build_docs="${enableval}"], [build_docs="auto"])
-
-if test "x${build_docs}" = xauto; then
- if test "x${GROFF}" = xnone ; then
- build_docs=no
- else
- build_docs=yes
- fi
-fi
-AC_MSG_RESULT([${build_docs}])
-if test "x${build_docs}" = xyes && test "x${GROFF}" = xnone ; then
- AC_MSG_ERROR([can't build documentation without groff])
-fi
-
-AM_CONDITIONAL(BUILD_DOCS, [test x$build_docs = xyes])
+AM_PROG_CC_C_O
# Need to call this explicitly since the first call to PKG_CHECK_MODULES
# is in an if statement, and later calls would break if it's skipped.
PKG_PROG_PKG_CONFIG
-XORG_DEFAULT_OPTIONS
-
#
# fix libtool to set SONAME to libXaw.so.$major
#
@@ -70,6 +51,7 @@ platform_darwin=no
LIBEXT=so
case $host_os in
cygwin*|mingw*)
+ LIBEXT=dll.a
platform_win32=yes
;;
darwin*)
@@ -89,8 +71,6 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
if test "x$build_v6" = xyes; then
PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu)
- AC_SUBST(XAW6_CFLAGS)
- AC_SUBST(XAW6_LIBS)
fi
@@ -102,8 +82,6 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
if test "x$build_v7" = xyes; then
PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
- AC_SUBST(XAW7_CFLAGS)
- AC_SUBST(XAW7_LIBS)
fi
@@ -112,29 +90,23 @@ AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADER(wctype.h,
- AC_DEFINE([HAS_WCTYPE_H],1,
- [Define to 1 if you have the <wctype.h> header file.]))
-AC_CHECK_HEADER(wchar.h,
- AC_DEFINE([HAS_WCHAR_H],1,
- [Define to 1 if you have the <wchar.h> header file.]))
-AC_CHECK_HEADER(widec.h, [],
- AC_DEFINE([NO_WIDEC_H],1,
- [Define to 1 if you DO NOT have the <widec.h> header file.]))
+AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
-AC_CHECK_FUNCS([iswalnum])
+AC_CHECK_FUNCS([iswalnum getpagesize])
-AC_OUTPUT([Makefile
- include/Makefile
- man/Makefile
- spec/Makefile
- src/Makefile])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ man/Makefile
+ specs/Makefile
+ src/Makefile])
if test "x$build_v6" = xyes; then
- AC_OUTPUT(xaw6.pc)
+ AC_CONFIG_FILES(xaw6.pc)
fi
if test "x$build_v7" = xyes; then
- AC_OUTPUT(xaw7.pc)
+ AC_CONFIG_FILES(xaw7.pc)
fi
+
+AC_OUTPUT