Update for version 2.4.1

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index 97cfcb1b14a47168810723c71c6d62aa66f110d4..9cebc9f2f9559c4aa9c00181bb298df307e788de 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl 
 dnl  $Id$
 dnl 
 dnl 
 dnl  $Id$
 dnl 

-dnl  Copyright © 2003 Keith Packard
+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 
 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


@@ -33,17 +33,26 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h

-AM_INIT_AUTOMAKE(fontconfig, 2.1.91)
+AM_INIT_AUTOMAKE(fontconfig, 2.4.1)
+AM_MAINTAINER_MODE

 
 dnl libtool versioning
 
 
 dnl libtool versioning
 

-LT_CURRENT=1
-LT_REVISION=4
-LT_AGE=0
+dnl bump revision when fixing bugs
+dnl bump current and age, reset revision to zero when adding APIs
+dnl bump current, leave age, reset revision to zero when changing/removing APIS
+LT_CURRENT=2
+LT_REVISION=0
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+LT_AGE=1

 
 LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 
 LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
 AC_SUBST(LT_VERSION_INFO)
 

+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+

 dnl ==========================================================================
 
 AM_CONFIG_HEADER(config.h)
 dnl ==========================================================================
 
 AM_CONFIG_HEADER(config.h)


@@ -51,9 +60,99 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S

+AC_LIBTOOL_WIN32_DLL

 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 

+dnl ==========================================================================
+
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+esac
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+
+if test "$os_win32" = "yes"; then
+  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+fi
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
+
+WARN_CFLAGS=""
+if test "x$GCC" = "xyes"; then
+       WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
+       -Wmissing-prototypes -Wmissing-declarations \
+       -Wnested-externs -fno-strict-aliasing"
+       AC_DEFINE_UNQUOTED(HAVE_WARNING_CPP_DIRECTIVE,1,
+       [Can use #warning in C files])
+fi
+AC_SUBST(WARN_CFLAGS)
+
+
+dnl ==========================================================================
+
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
+dnl ==========================================================================
+
+# Setup for compiling build tools (fc-glyphname, etc)
+AC_MSG_CHECKING([for a C compiler for build tools])
+if test $cross_compiling = yes; then
+  AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+else
+  CC_FOR_BUILD=$CC
+fi
+AC_MSG_RESULT([$CC_FOR_BUILD])
+AC_SUBST(CC_FOR_BUILD)
+
+AC_MSG_CHECKING([for suffix of executable build tools])
+if test $cross_compiling = yes; then
+  cat >conftest.c <<\_______EOF
+int
+main ()
+{
+  exit (0);
+}
+_______EOF
+  for i in .exe ""; do
+    compile="$CC_FOR_BUILD conftest.c -o conftest$i"
+    if AC_TRY_EVAL(compile); then
+      if (./conftest) 2>&AC_FD_CC; then
+       EXEEXT_FOR_BUILD=$i
+       break
+      fi
+    fi
+  done
+  rm -f conftest*
+  if test "${EXEEXT_FOR_BUILD+set}" != set; then
+    AC_MSG_ERROR([Cannot determine suffix of executable build tools])
+  fi
+else
+  EXEEXT_FOR_BUILD=$EXEEXT
+fi
+AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
+AC_SUBST(EXEEXT_FOR_BUILD)
+
+dnl ==========================================================================
+
+AC_ARG_WITH(arch,      [  --with-arch=ARCH      Force architecture to ARCH], arch="$withval", arch=auto)
+
+if test $cross_compiling = yes; then
+       case "$arch" in
+       auto)
+               AC_MSG_ERROR([Cannot autodetect architecture in cross compile environment]
+                            [Use --with-arch=ARCH to specify architecture])
+               ;;
+       esac
+fi
+
+ARCHITECTURE=$arch
+AC_SUBST(ARCHITECTURE)
+
+dnl ==========================================================================
+

 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC


@@ -61,17 +160,52 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

+AC_C_INLINE

 AC_TYPE_PID_T
 
 # Checks for library functions.
 AC_FUNC_VPRINTF
 AC_TYPE_PID_T
 
 # Checks for library functions.
 AC_FUNC_VPRINTF

-AC_CHECK_FUNCS([memmove memset strchr strrchr strtol getopt getopt_long])
+AC_FUNC_MMAP
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand_r])
+
+#
+# Checks for iconv
+#
+AC_MSG_CHECKING([for a usable iconv])
+ICONV_LIBS=""
+AC_TRY_LINK([#include <iconv.h>],
+           [iconv_open ("from", "to");],
+           [use_iconv=1],
+           [use_iconv=0])
+if test x$use_iconv = x1; then
+       AC_MSG_RESULT([libc])
+else
+       # try using libiconv
+       fontconfig_save_libs="$LIBS"
+       LIBS="$LIBS -liconv"
+
+       AC_TRY_LINK([#include <iconv.h>],
+                   [iconv_open ("from", "to");],
+                   [use_iconv=true],
+                   [use_iconv=false])
+       
+       if test x$use_iconv = x1; then
+               ICONV_LIBS="-liconv"
+               AC_MSG_RESULT([libiconv])
+       else
+               AC_MSG_RESULT([no])
+       fi
+
+       LIBS="$fontconfig_save_libs"
+fi
+AC_SUBST(ICONV_LIBS)
+AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])

 
 #
 # Checks for FreeType
 #
 
 
 #
 # Checks for FreeType
 #
 

-AC_ARG_WITH(freetype_config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
+AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)

 
 if test "$freetype_config" = "yes"; then 
        AC_PATH_PROG(ft_config,freetype-config,no)
 
 if test "$freetype_config" = "yes"; then 
        AC_PATH_PROG(ft_config,freetype-config,no)


@@ -82,128 +216,179 @@ else
        ft_config="$freetype_config"
 fi
 
        ft_config="$freetype_config"
 fi
 

-FREETYPE_CFLAGS="$($ft_config --cflags)"
-FREETYPE_LIBS="$($ft_config --libs)"
+FREETYPE_CFLAGS="`$ft_config --cflags`"
+FREETYPE_LIBS="`$ft_config --libs`"

 
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
 
 #
 
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
 
 #

-# Check to see whether we have FT_Get_First_Char(), new in 2.0.9
+# Check to see whether we have:
+#  FT_Get_Next_Char
+#  FT_Get_BDF_Property
+#  FT_Get_PS_Font_Info
+#  FT_Has_PS_Glyph_Names

 #
 
 #
 

-fontconfig_save_libs=$LIBS
+fontconfig_save_libs="$LIBS"
+fontconfig_save_cflags="$CFLAGS"

 LIBS="$LIBS $FREETYPE_LIBS"
 LIBS="$LIBS $FREETYPE_LIBS"

-AC_CHECK_FUNCS(FT_Get_First_Char)
-LIBS=$fontconfig_save_libs
+CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format)
+AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,
+               HAVE_FT_BITMAP_SIZE_Y_PPEM=1,
+               HAVE_FT_BITMAP_SIZE_Y_PPEM=0,
+[#include <ft2build.h>
+#include FT_FREETYPE_H])
+AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
+                  [FT_Bitmap_Size structure includes y_ppem field])
+CFLAGS="$fontconfig_save_cflags"
+LIBS="$fontconfig_save_libs"

 
 #
 # Check expat configuration
 #
 
 AC_ARG_WITH(expat,             [  --with-expat=DIR              Use Expat in DIR], expat=$withval, expat=yes)
 
 #
 # Check expat configuration
 #
 
 AC_ARG_WITH(expat,             [  --with-expat=DIR              Use Expat in DIR], expat=$withval, expat=yes)

-AC_ARG_WITH(expat_includes,    [  --with-expat-includes=DIR     Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
-AC_ARG_WITH(expat_lib,         [  --with-expat-lib=DIR          Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
+AC_ARG_WITH(expat-includes,    [  --with-expat-includes=DIR     Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
+AC_ARG_WITH(expat-lib,         [  --with-expat-lib=DIR          Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)

 
 

-case "$expat" in
-no)
+if test "$enable_libxml2" != "yes"; then
+       case "$expat" in
+       no)

        ;;
        ;;

-*)
-       case "$expat_includes" in
-       yes|no)
-               EXPAT_CFLAGS=""
-               ;;

        *)
        *)

-               EXPAT_CFLAGS="-I$expat_includes"
-               ;;
-       esac
-       case "$expat_lib" in
-       yes)
-               case "$expat" in
+               case "$expat_includes" in

                yes)
                yes)

-                       EXPAT_LIBS="-lexpat"
+                       case "$expat" in
+                       yes)
+                               ;;
+                       *)
+                               EXPAT_CFLAGS="-I$expat/include"
+                               ;;
+                       esac
+                       ;;
+               no)
+                       EXPAT_CFLAGS=""

                        ;;
                *)
                        ;;
                *)

-                       EXPAT_LIBS="-L$expat/lib -lexpat"
+                       EXPAT_CFLAGS="-I$expat_includes"
+                       ;;
+               esac
+               case "$expat_lib" in
+               yes)
+                       case "$expat" in
+                       yes)
+                               EXPAT_LIBS="-lexpat"
+                               ;;
+                       *)
+                               EXPAT_LIBS="-L$expat/lib -lexpat"
+                               ;;
+                       esac
+                       ;;
+               no)
+                       ;;
+               *)
+                       EXPAT_LIBS="-L$expat_lib -lexpat"

                        ;;
                esac
                        ;;
                esac

-               ;;
-       no)
-               ;;
-       *)
-               EXPAT_LIBS="-L$expat_lib -lexpat"
-               ;;
-       esac

 
 

-       expatsaved_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
-       expatsaved_LIBS="$LIBS"
-       LIBS="$LIBS $EXPAT_LIBS"
+               expatsaved_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
+               expatsaved_LIBS="$LIBS"
+               LIBS="$LIBS $EXPAT_LIBS"

 
 

-       AC_CHECK_HEADER(expat.h)
-       case "$ac_cv_header_expat_h" in
-       no)
-               AC_CHECK_HEADER(xmlparse.h)
-               case "$ac_cv_header_xmlparse_h" in
+               AC_CHECK_HEADER(expat.h)
+               case "$ac_cv_header_expat_h" in

                no)
                no)

-                       have_expat_header=no;
+                       AC_CHECK_HEADER(xmlparse.h)
+                       case "$ac_cv_header_xmlparse_h" in
+                       no)
+                               have_expat_header=no;
+                               ;;
+                       yes)
+                               HAVE_XMLPARSE_H=1
+                               AC_SUBST(HAVE_XMLPARSE_H)
+                               AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
+                               [Use xmlparse.h instead of expat.h])
+                               have_expat_header=yes
+                               ;;
+                       esac

                        ;;
                yes)
                        ;;
                yes)

-                       HAVE_XMLPARSE_H=1
-                       AC_SUBST(HAVE_XMLPARSE_H)
-                       AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
-                       [Use xmlparse.h instead of expat.h])

                        have_expat_header=yes
                        ;;
                esac
                        have_expat_header=yes
                        ;;
                esac

-               ;;
-       yes)
-               have_expat_header=yes
-               ;;
-       esac
-       case "$have_expat_header" in
-       no)
-               expat=no
-               ;;
-       yes)
-               AC_CHECK_FUNCS(XML_ParserCreate)
-               case "$ac_cv_func_XML_ParserCreate" in
+               case "$have_expat_header" in

                no)
                        expat=no
                        ;;
                yes)
                no)
                        expat=no
                        ;;
                yes)

-                       HAVE_EXPAT=1
-                       AC_SUBST(HAVE_EXPAT)
-                       AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
-                       [Found a useable expat library])
+                       AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
+                       case "$ac_cv_func_XML_SetDoctypeDeclHandler" in
+                       yes)
+                               HAVE_EXPAT=1
+                               AC_SUBST(HAVE_EXPAT)
+                               AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
+                               [Found a useable expat library])
+                               ;;
+                       *)
+                               expat=no
+                               ;;
+                       esac

                        ;;
                esac
                        ;;
                esac

+               CPPFLAGS="$expatsaved_CPPFLAGS"
+               LIBS="$expatsaved_LIBS"

                ;;
        esac
                ;;
        esac

-       CPPFLAGS="$saved_CPPFLAGS"
-       LIBS="$saved_LIBS"
-       ;;
-esac
-AC_SUBST(EXPAT_LIBS)
-AC_SUBST(EXPAT_CFLAGS)

        
        

-case "$expat" in
-no)
-       AC_MSG_ERROR([cannot find expat library])
-       ;;
-esac
+       AC_SUBST(EXPAT_CFLAGS)
+       AC_SUBST(EXPAT_LIBS)
+
+       case "$expat" in
+       no)
+               EXPAT_CFLAGS=""
+               EXPAT_LIBS=""
+
+               AC_MSG_WARN([Cannot find usable expat library. Trying to use libxml2 as fallback.])
+               ;;
+       esac
+fi
+
+#
+# Check libxml2 configuration
+#
+
+AC_ARG_ENABLE(libxml2,         [  --enable-libxml2              Use libxml2 instead of Expat])
+
+PKG_PROG_PKG_CONFIG
+
+if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
+    PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
+    AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
+
+    AC_SUBST(LIBXML2_CFLAGS)
+    AC_SUBST(LIBXML2_LIBS)
+fi

 
 #
 # Set default font directory
 #
 
 
 #
 # Set default font directory
 #
 

-AC_ARG_WITH(default_fonts,     [  --with-default-fonts=DIR      Use fonts from DIR when config is busted], defaultfonts="$withval", default_fonts=yes)
+AC_ARG_WITH(default-fonts,     [  --with-default-fonts=DIR      Use fonts from DIR when config is busted], default_fonts="$withval", default_fonts=yes)

 
 case "$default_fonts" in
 yes)
 
 case "$default_fonts" in
 yes)

-       FC_DEFAULT_FONTS="/usr/share/fonts"
-       AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
-                          [System font directory])
+       if test "$os_win32" = "yes"; then
+               FC_DEFAULT_FONTS="WINDOWSFONTDIR"
+               AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "WINDOWSFONTDIR", 
+                                  [Windows font directory])
+       else
+               FC_DEFAULT_FONTS="/usr/share/fonts"
+               AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
+                                  [System font directory])
+       fi

        ;;
 *)
        FC_DEFAULT_FONTS="$default_fonts"
        ;;
 *)
        FC_DEFAULT_FONTS="$default_fonts"


@@ -219,7 +404,7 @@ AC_SUBST(FC_DEFAULT_FONTS)
 # with outline fonts; those with bitmaps can be added as desired in
 # local.conf or ~/.fonts.conf
 #
 # with outline fonts; those with bitmaps can be added as desired in
 # local.conf or ~/.fonts.conf
 #

-AC_ARG_WITH(add_fonts,        [  --with-add-fonts=DIR1,DIR2,...Find additional fonts in DIR1,DIR2,... ], add_fonts="$withval", add_fonts=yes)
+AC_ARG_WITH(add-fonts,        [  --with-add-fonts=DIR1,DIR2,...Find additional fonts in DIR1,DIR2,... ], add_fonts="$withval", add_fonts=yes)

 
 case "$add_fonts" in
 yes)
 
 case "$add_fonts" in
 yes)


@@ -227,19 +412,16 @@ yes)
        for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
                case x"$FC_ADD_FONTS" in
                x)
        for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
                case x"$FC_ADD_FONTS" in
                x)

-                       if test -d "$dir/fonts"; then
-                               for sub in "$dir"/fonts/*; do
-                                       if ls "$sub" | grep -q -i '\.pf\|\.tt\|.ot'; then
-                                               case x$FC_ADD_FONTS in
-                                               x)
-                                                       FC_ADD_FONTS="$sub"
-                                                       ;;
-                                               *)
-                                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
-                                                       ;;
-                                               esac
-                                       fi
-                               done
+                       sub="$dir/fonts"
+                       if test -d "$sub"; then
+                               case x$FC_ADD_FONTS in
+                               x)
+                                       FC_ADD_FONTS="$sub"
+                                       ;;
+                               *)
+                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
+                                       ;;
+                               esac

                        fi
                        ;;
                esac
                        fi
                        ;;
                esac


@@ -270,7 +452,23 @@ esac
 
 AC_SUBST(FC_FONTPATH)
 
 
 AC_SUBST(FC_FONTPATH)
 

-FC_FONTDATE=`date`
+#
+# Set default cache directory path
+#
+AC_ARG_WITH(cache-dir,         [ --with-cache-dir=DIR           Use DIR to store cache files (default /var/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
+
+case $fc_cachedir in
+no|yes)
+       fc_cachedir=`eval echo "${localstatedir}/cache/"${PACKAGE}`
+       ;;
+*)
+       ;;
+esac
+AC_SUBST(fc_cachedir)
+FC_CACHEDIR=${fc_cachedir}
+AC_SUBST(FC_CACHEDIR)
+
+FC_FONTDATE=`LC_ALL=C date`

 
 AC_SUBST(FC_FONTDATE)
 
 
 AC_SUBST(FC_FONTDATE)
 


@@ -296,7 +494,7 @@ AC_SUBST(CONFDIR)
 # Find out what language orthographies are included
 #
 
 # Find out what language orthographies are included
 #
 

-ORTH_FILES=`cd fc-lang && echo *.orth`
+ORTH_FILES=`cd ${srcdir}/fc-lang && echo *.orth`

 AC_SUBST(ORTH_FILES)
 
 #
 AC_SUBST(ORTH_FILES)
 
 #


@@ -305,16 +503,42 @@ AC_SUBST(ORTH_FILES)
 
 AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
 
 
 AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
 

-AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=yes)
+AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)

 
 

-if test "x$enable_docs" = xyes; then
-  if test "x$HASDOCBOOK" != xyes; then
-    enable_docs=no
-  fi
+default_docs="yes"
+#
+# Check if docs exist or can be created
+#
+if test x$HASDOCBOOK = xno; then
+       if test -f doc/fonts-conf.5; then
+               :
+       else
+               default_docs="no"
+       fi

 fi
 
 fi
 

+AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=$default_docs)
+

 AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
 
 AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
 

+if test "x$enable_docs" = xyes; then
+       DOCSRC="doc"
+       tmp=funcs.$$
+       cat $srcdir/doc/*.fncs | awk '
+       /^@TITLE@/      { if (!done) { printf ("%s\n", $2); done = 1; } }
+       /^@FUNC@/       { if (!done) { printf ("%s\n", $2); done = 1; } }
+       /^@@/           { done = 0; }' > $tmp
+       DOCMAN3=`cat $tmp | awk '{ printf ("%s.3 ", $1); }'`
+       echo DOCMAN3 $DOCMAN3
+       rm -f $tmp
+else
+       DOCSRC=""
+       DOCMAN3=""
+fi
+
+AC_SUBST(DOCSRC)
+AC_SUBST(DOCMAN3)
+

 #
 # Figure out where to install documentation
 #
 #
 # Figure out where to install documentation
 #


@@ -329,16 +553,26 @@ fi
 
 AC_SUBST(DOCDIR)
 
 
 AC_SUBST(DOCDIR)
 

+

 AC_OUTPUT([
 Makefile 
 fontconfig/Makefile
 fc-lang/Makefile
 AC_OUTPUT([
 Makefile 
 fontconfig/Makefile
 fc-lang/Makefile

+fc-glyphname/Makefile
+fc-case/Makefile
+fc-arch/Makefile

 src/Makefile
 src/Makefile

+src/fontconfig.def
+conf.d/Makefile

 fc-cache/Makefile
 fc-cache/Makefile

+fc-cat/Makefile

 fc-list/Makefile
 fc-list/Makefile

+fc-match/Makefile

 doc/Makefile
 doc/Makefile

+doc/version.sgml

 test/Makefile
 fontconfig.spec
 fontconfig.pc
 fonts.conf
 test/Makefile
 fontconfig.spec
 fontconfig.pc
 fonts.conf

+fontconfig-zip

 ])
 ])