X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=b274a8f9e0e9b0082d0aeb44edc5f1ad2e10c12e;hb=3e1969f2133dfd2fac68f01b2b2aa460d86174d7;hp=8389dfceb31f4da52c9275de060515a8efd96af7;hpb=45d55832022c5ce693e99f8de99480ab968e5ff0;p=framework%2Fuifw%2Fxorg%2Flib%2Flibxfont.git diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 index 8389dfc..b274a8f --- a/configure.ac +++ b/configure.ac @@ -1,63 +1,58 @@ -dnl Copyright © 2003 Keith Packard -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Initialize Autoconf AC_PREREQ([2.60]) - -AC_INIT([libXfont], - [1.4.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXfont) -# Autoheader generates config.h.in. No new lines allowed in the list. +AC_INIT([libXfont], [1.4.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont]) +AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h]) -dnl -dnl This is the package version number, not the shared library -dnl version. This same version number must appear in Xfont.h -dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's -dnl not possible to extract the version number here from Xfont.h -dnl + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Initialize libtool +AC_PROG_LIBTOOL + # Require xorg-macros minimum of 1.10 for DocBook XML documentation 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_DEVEL_DOCS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_CHECK_SGML_DOCTOOLS(1.7) -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL -dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config -dnl must first be located explicitly. -PKG_PROG_PKG_CONFIG - -# Look for headers +# Checks for header files. AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) + +# Checks for library functions. AC_CHECK_FUNCS([poll]) +# If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config +# must first be located explicitly. +PKG_PROG_PKG_CONFIG + # # select libraries to include # @@ -74,13 +69,13 @@ AM_CONDITIONAL(XFONT_FREETYPE, [test x$XFONT_FREETYPE = xyes]) if test x$XFONT_FREETYPE = xyes; then AC_DEFINE(XFONT_FREETYPE,1,[Support FreeType rasterizer for nearly all font file formats]) AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto) - + if test "$freetype_config" = "auto" ; then - PKG_CHECK_MODULES(FREETYPE, freetype2, + PKG_CHECK_MODULES(FREETYPE, freetype2, freetype_config=no, freetype_config=yes) fi - if test "$freetype_config" = "yes"; then + if test "$freetype_config" = "yes"; then AC_PATH_PROG(ft_config,freetype-config,no) if test "$ft_config" = "no"; then AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/]) @@ -89,7 +84,7 @@ if test x$XFONT_FREETYPE = xyes; then ft_config="$freetype_config" fi - if test "$freetype_config" != "no"; then + if test "$freetype_config" != "no"; then FREETYPE_CFLAGS="`$ft_config --cflags`" FREETYPE_LIBS="`$ft_config --libs`" fi @@ -117,8 +112,8 @@ X_GZIP_FONT_COMPRESSION=1 AC_SUBST(X_GZIP_FONT_COMPRESSION) AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required])) -AC_ARG_WITH(bzip2, - AS_HELP_STRING([--with-bzip2], +AC_ARG_WITH(bzip2, + AS_HELP_STRING([--with-bzip2], [Support bzip2 compressed bitmap fonts]), [], [with_bzip2=no]) if test "x$with_bzip2" = xyes; then @@ -200,14 +195,15 @@ case $host_os in esac AC_SUBST([OS_CFLAGS]) -AC_OUTPUT([Makefile - doc/Makefile - src/Makefile - src/fontfile/Makefile - src/FreeType/Makefile - src/builtins/Makefile - src/bitmap/Makefile - src/fc/Makefile - src/util/Makefile - src/stubs/Makefile - xfont.pc]) +AC_CONFIG_FILES([Makefile + doc/Makefile + src/Makefile + src/fontfile/Makefile + src/FreeType/Makefile + src/builtins/Makefile + src/bitmap/Makefile + src/fc/Makefile + src/util/Makefile + src/stubs/Makefile + xfont.pc]) +AC_OUTPUT