summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/tests.ac
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/tests.ac')
-rw-r--r--Build/source/texk/web2c/xetexdir/tests.ac12
1 files changed, 5 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/xetexdir/tests.ac b/Build/source/texk/web2c/xetexdir/tests.ac
index 505a7fada03..ee0c1e29382 100644
--- a/Build/source/texk/web2c/xetexdir/tests.ac
+++ b/Build/source/texk/web2c/xetexdir/tests.ac
@@ -4,7 +4,6 @@ AC_DEFUN([AC_HAS_CARBON], [
#
# Check for Carbon framework on Mac OS X
#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
AC_MSG_CHECKING([for Apple Carbon framework])
AC_TRY_COMPILE(
[
@@ -28,7 +27,6 @@ AC_DEFUN([AC_HAS_QUICKTIME], [
#
# Check for QuickTime framework on Mac OS X
#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
AC_MSG_CHECKING([for Apple QuickTime framework])
AC_TRY_COMPILE(
[
@@ -57,10 +55,10 @@ AC_DEFUN([AC_HAS_LIBFONTCONFIG], [
[ --with-fontconfig=DIR use fontconfig include/library files from DIR],
[
if test -d "$withval"; then
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
+ LDFLAGS="$LDFLAGS -L$withval/lib"
FONTCONFIGCPPFLAGS="-I$withval/include"
- LDFONTCONFIG="-L$withval/lib"
- CPPFLAGS="$CPPFLAGS $FONTCONFIGCPPFLAGS"
- LDFLAGS="$LDFLAGS $LDFONTCONFIG"
+ FONTCONFIGLDFLAGS="-L$withval/lib"
fi
]
)
@@ -74,11 +72,11 @@ FcObjectSet *os;
[ AC_MSG_RESULT(yes)
AC_CHECK_LIB(fontconfig, FcInit, [
AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [Define if you have libfontconfig])
- LDFONTCONFIG="$LDFONTCONFIG -lfontconfig"
+ LDFONTCONFIG="-lfontconfig"
])
],
[ AC_MSG_RESULT(no)
- FONTCONFIGCPPFLAGS=
+ CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
LDFONTCONFIG=
]
)