summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx/configure
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2012-09-06 12:31:05 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2012-09-06 12:31:05 +0000
commit1d9631c13b2d3c1b328fd37f7a3c8a1c33fe38eb (patch)
tree8d73146a71e29d9712bdd5caabde07b9526b9a80 /Build/source/texk/xdvipdfmx/configure
parent5d4738caf610e94abb73d4f65602fb42fae218ac (diff)
Reautoconf
git-svn-id: svn://tug.org/texlive/trunk@27606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx/configure')
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure139
1 files changed, 7 insertions, 132 deletions
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index a0e1fd2aef2..180a7e63f6e 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -619,8 +619,6 @@ build_MacOsX_FALSE
build_MacOsX_TRUE
build_FALSE
build_TRUE
-FONTCONFIG_LIBS
-FONTCONFIG_INCLUDES
FREETYPE2_RULE
FREETYPE2_DEPEND
FREETYPE2_LIBS
@@ -777,8 +775,6 @@ with_zlib_libdir
with_system_libpng
with_system_freetype2
with_paper
-with_fontconfig_includes
-with_fontconfig_libdir
'
ac_precious_vars='build_alias
host_alias
@@ -1446,10 +1442,6 @@ Optional Packages:
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
--with-paper=DIR use paper include/library files from DIR
- --with-fontconfig-includes=DIR
- fontconfig headers installed in DIR
- --with-fontconfig-libdir=DIR
- fontconfig library installed in DIR
Some influential environment variables:
CC C compiler command
@@ -15773,6 +15765,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+can_build=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X ApplicationServices framework" >&5
$as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; }
if ${kpse_cv_have_ApplicationServices+:} false; then :
@@ -15804,126 +15797,10 @@ $as_echo "#define HAVE_APPLICATIONSERVICES 1" >>confdefs.h
fi
-
-# Check whether --with-fontconfig-includes was given.
-if test "${with_fontconfig_includes+set}" = set; then :
- withval=$with_fontconfig_includes;
-fi
-
-# Check whether --with-fontconfig-libdir was given.
-if test "${with_fontconfig_libdir+set}" = set; then :
- withval=$with_fontconfig_libdir;
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed fontconfig headers and library" >&5
-$as_echo_n "checking for installed fontconfig headers and library... " >&6; }
-if ${kpse_cv_have_fontconfig+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- kpse_save_CPPFLAGS=$CPPFLAGS
-kpse_save_LIBS=$LIBS
-kpse_cv_fontconfig_includes=
-kpse_cv_fontconfig_libs='-lfontconfig'
-if test "x$with_fontconfig_includes:$with_fontconfig_libdir" != x:; then
- if test "x$with_fontconfig_includes" != x; then
- kpse_cv_fontconfig_includes="-I$with_fontconfig_includes"
- fi
- if test "x$with_fontconfig_libdir" != x; then
- kpse_cv_fontconfig_libs="-L$with_fontconfig_libdir $kpse_cv_fontconfig_libs"
- fi
-elif $PKG_CONFIG fontconfig; then
- kpse_cv_fontconfig_includes=`$PKG_CONFIG fontconfig --cflags`
- kpse_cv_fontconfig_libs=`$PKG_CONFIG fontconfig --libs`
-fi
-CPPFLAGS="$kpse_cv_fontconfig_includes $CPPFLAGS"
-LIBS="$kpse_cv_fontconfig_libs $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <fontconfig/fontconfig.h>
-int
-main ()
-{
-FcObjectSet *os; FcInit();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- kpse_cv_have_fontconfig=yes
-else
- kpse_cv_have_fontconfig=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_fontconfig" >&5
-$as_echo "$kpse_cv_have_fontconfig" >&6; }
-if test "x$kpse_cv_have_fontconfig" = xyes; then
- FONTCONFIG_INCLUDES=$kpse_cv_fontconfig_includes
- FONTCONFIG_LIBS=$kpse_cv_fontconfig_libs
-
-$as_echo "#define HAVE_LIBFONTCONFIG 1" >>confdefs.h
-
-fi
-
-
-
if test "x$kpse_cv_have_ApplicationServices" = xyes; then
- can_build=yes
$as_echo "#define XETEX_MAC 1" >>confdefs.h
-else
- eval CPPFLAGS=\"$FONTCONFIG_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$FONTCONFIG_LIBS \$LIBS\"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig header files and library" >&5
-$as_echo_n "checking for fontconfig header files and library... " >&6; }
-if ${cho_cv_have_fontconfig+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <fontconfig/fontconfig.h>
-int
-main ()
-{
-FcObjectSet *os;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- cho_cv_have_fontconfig=yes
-else
- cho_cv_have_fontconfig=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cho_cv_have_fontconfig" >&5
-$as_echo "$cho_cv_have_fontconfig" >&6; }
-if test "x$cho_cv_have_fontconfig" = xyes; then :
- for ac_func in FcInit
-do :
- ac_fn_c_check_func "$LINENO" "FcInit" "ac_cv_func_FcInit"
-if test "x$ac_cv_func_FcInit" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FCINIT 1
-_ACEOF
-
-$as_echo "#define HAVE_LIBFONTCONFIG 1" >>confdefs.h
-
-fi
-done
-
-fi
-
- CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
- can_build=$cho_cv_have_fontconfig
fi
if test "x$can_build" = xyes; then
@@ -15931,14 +15808,12 @@ if test "x$can_build" = xyes; then
$as_echo "#define XETEX 1" >>confdefs.h
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig library or ApplicationServices framework not found.
-This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
-or the fontconfig library (on other platforms) to be available, otherwise it
-cannot support XeTeX output using standard system-installed fonts." >&5
-$as_echo "$as_me: WARNING: fontconfig library or ApplicationServices framework not found.
-This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
-or the fontconfig library (on other platforms) to be available, otherwise it
-cannot support XeTeX output using standard system-installed fonts." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ApplicationServices framework not found. This version of
+xdvipdfmx requires ApplicationServices (on Mac OS X) to be available, otherwise
+it cannot support XeTeX output using standard system-installed fonts." >&5
+$as_echo "$as_me: WARNING: ApplicationServices framework not found. This version of
+xdvipdfmx requires ApplicationServices (on Mac OS X) to be available, otherwise
+it cannot support XeTeX output using standard system-installed fonts." >&2;}
if test "x$enable_build" != xno; then
as_fn_error $? "exiting" "$LINENO" 5
fi