X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=configure.in;h=b7749bf23d87bfa5576ac5b17791dd123ce635bc;hp=202e32a4647af82c92bad8fa211d757e73172d94;hb=2e44cbe1b9bf466718167e9e05077743df36ab21;hpb=3bfae75d44db5ceae394194d2e6c7b81201ea685 diff --git a/configure.in b/configure.in index 202e32a..b7749bf 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl $Id$ +dnl fontconfig/configure.in dnl dnl Copyright © 2003 Keith Packard dnl @@ -13,9 +13,9 @@ 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 THE AUTHOR(S) 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 EVENT SHALL THE AUTHOR(S) 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 @@ -33,22 +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 -AM_INIT_AUTOMAKE(fontconfig, 2.3.93) +AM_INIT_AUTOMAKE(fontconfig, 2.7.3) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE dnl libtool versioning -LT_CURRENT=1 -LT_REVISION=4 -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -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 +LIBT_CURRENT=5 +LIBT_REVISION=4 +AC_SUBST(LIBT_CURRENT) +AC_SUBST(LIBT_REVISION) +LIBT_AGE=4 -LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" -AC_SUBST(LT_VERSION_INFO) +LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" +AC_SUBST(LIBT_VERSION_INFO) -LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` -AC_SUBST(LT_CURRENT_MINUS_AGE) +LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` +AC_SUBST(LIBT_CURRENT_MINUS_AGE) dnl ========================================================================== @@ -59,6 +63,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL +DOLT AC_PROG_MAKE_SET dnl ========================================================================== @@ -78,14 +83,16 @@ 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) @@ -132,18 +139,69 @@ 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 -AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h iconv.h]) +AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h]) # 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_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv]) +AC_FUNC_MMAP +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48]) + +# +# Checks for iconv +# +AC_MSG_CHECKING([for a usable iconv]) +ICONV_LIBS="" +AC_TRY_LINK([#include ], + [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_open ("from", "to");], + [use_iconv=1], + [use_iconv=0]) + + 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 @@ -166,19 +224,11 @@ FREETYPE_LIBS="`$ft_config --libs`" AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) -# -# 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_cflags="$CFLAGS" LIBS="$LIBS $FREETYPE_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_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format FT_Select_Size) AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem, HAVE_FT_BITMAP_SIZE_Y_PPEM=1, HAVE_FT_BITMAP_SIZE_Y_PPEM=0, @@ -306,6 +356,8 @@ fi 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]) @@ -394,11 +446,31 @@ esac AC_SUBST(FC_FONTPATH) +# +# Set default cache directory path +# +AC_ARG_WITH(cache-dir, [ --with-cache-dir=DIR Use DIR to store cache files (default LOCALSTATEDIR/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes) + +case $fc_cachedir in +no|yes) + if test "$os_win32" = "yes"; then + fc_cachedir="WINDOWSTEMPDIR_FONTCONFIG_CACHE" + else + fc_cachedir='${localstatedir}/cache/${PACKAGE}' + fi + ;; +*) + ;; +esac +AC_SUBST(fc_cachedir) +FC_CACHEDIR=${fc_cachedir} +AC_SUBST(FC_CACHEDIR) + FC_FONTDATE=`LC_ALL=C date` AC_SUBST(FC_FONTDATE) -AC_ARG_WITH(confdir, [ --with-confdir=DIR Use DIR to store configuration files (default /etc/fonts)], confdir="$withval", confdir=yes) +AC_ARG_WITH(confdir, [ --with-confdir=DIR Use DIR to store configuration files (default SYSCONFDIR/fonts)], confdir="$withval", confdir=yes) # # Set CONFDIR and FONTCONFIG_PATH @@ -416,13 +488,6 @@ CONFDIR=${confdir} AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR",[Font configuration directory]) AC_SUBST(CONFDIR) -# -# Find out what language orthographies are included -# - -ORTH_FILES=`cd ${srcdir}/fc-lang && echo *.orth` -AC_SUBST(ORTH_FILES) - # # Let people not build/install docs if they don't have docbook # @@ -436,7 +501,7 @@ 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 + if test -f $srcdir/doc/fonts-conf.5; then : else default_docs="no" @@ -465,45 +530,25 @@ fi AC_SUBST(DOCSRC) AC_SUBST(DOCMAN3) -# -# Figure out where to install documentation -# - -AC_ARG_WITH(docdir, [ --with-docdir=DIR Use DIR to store documentation files (default ${datadir}/doc/fontconfig)], confdir="$withval") - -if test "x$with_docdir" = "x" ; then - DOCDIR='${datadir}/doc/fontconfig' -else - DOCDIR=$with_docdir -fi - -AC_SUBST(DOCDIR) - -# -# Make /var/cache/fontconfig directory available to source code -# - -pkgcachedir='${localstatedir}/cache/'${PACKAGE} -AC_SUBST(pkgcachedir) - AC_OUTPUT([ Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile +fc-arch/Makefile src/Makefile -src/fontconfig.def conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile +fc-query/Makefile +fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc -fonts.conf fontconfig-zip ])