X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=configure.in;h=76e8d44ebc651e900c1d4887d5dd516f7c2a126d;hb=ee1d81259ec5b0b91cf19ea72abec29f5561217b;hp=22bfad5a5acb5a2d3488ffa18fd7b03a2e3d189a;hpb=6348213702153f1097c648ae575bcc89dbb259dc;p=fontconfig.git diff --git a/configure.in b/configure.in index 22bfad5..76e8d44 100644 --- a/configure.in +++ b/configure.in @@ -33,17 +33,22 @@ 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.1.92) +AM_INIT_AUTOMAKE(fontconfig, 2.2.90) dnl libtool versioning LT_CURRENT=1 LT_REVISION=4 +AC_SUBST(LT_CURRENT) +AC_SUBST(LT_REVISION) LT_AGE=0 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) @@ -51,9 +56,28 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S +AC_LIBTOOL_WIN32_DLL 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) + +dnl ========================================================================== + # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC @@ -65,13 +89,13 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS([memmove memset strchr strrchr strtol getopt getopt_long]) +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long]) # # 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) @@ -82,8 +106,8 @@ else 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) @@ -102,8 +126,8 @@ LIBS=$fontconfig_save_libs # 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) @@ -166,22 +190,22 @@ no) expat=no ;; yes) - AC_CHECK_FUNCS(XML_ParserCreate) - case "$ac_cv_func_XML_ParserCreate" in - no) - expat=no - ;; + 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 - CPPFLAGS="$saved_CPPFLAGS" - LIBS="$saved_LIBS" + CPPFLAGS="$expatsaved_CPPFLAGS" + LIBS="$expatsaved_LIBS" ;; esac AC_SUBST(EXPAT_LIBS) @@ -189,7 +213,7 @@ AC_SUBST(EXPAT_CFLAGS) case "$expat" in no) - AC_MSG_ERROR([cannot find expat library]) + AC_MSG_ERROR([Cannot find usable expat library. This could mean that your version is too old.]) ;; esac @@ -197,13 +221,19 @@ esac # 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) - 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" @@ -219,7 +249,7 @@ AC_SUBST(FC_DEFAULT_FONTS) # 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) @@ -229,7 +259,7 @@ yes) x) if test -d "$dir/fonts"; then for sub in "$dir"/fonts/*; do - if ls "$sub" | grep -q -i '\.pf\|\.tt\|.ot'; then + if ls "$sub" | grep -q -i '\.pf\|\.tt\|\.ot'; then case x$FC_ADD_FONTS in x) FC_ADD_FONTS="$sub" @@ -333,13 +363,17 @@ AC_OUTPUT([ Makefile fontconfig/Makefile fc-lang/Makefile +fc-glyphname/Makefile src/Makefile +src/fontconfig.def fc-cache/Makefile fc-list/Makefile +fc-match/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fonts.conf +fontconfig-zip ])