summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-15 16:41:36 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-15 16:41:36 +0000
commit2245bf86e7003e946a83553717ddba351c79a2d4 (patch)
tree8dfb8d0078ed2c39a66fe9876a998cf7b011a8e5 /Build/source/texk/web2c
parent093504a20ee3ac774c8ae449ca2505a1e8d3fbc1 (diff)
fixed --with-fontconfig=DIR option so both xetex and xdvipdfmx build with relocated libfontconfig
git-svn-id: svn://tug.org/texlive/trunk@2748 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rwxr-xr-xBuild/source/texk/web2c/configure160
-rw-r--r--Build/source/texk/web2c/configure.in1
-rw-r--r--Build/source/texk/web2c/xetexdir/tests.ac12
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.mk3
4 files changed, 92 insertions, 84 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 644f4fe7451..0a2e9656079 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -3623,11 +3623,10 @@ if test "x$with_xetex" = xyes; then
#
# Check for Carbon framework on Mac OS X
#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
echo $ac_n "checking for Apple Carbon framework""... $ac_c" 1>&6
-echo "configure:3629: checking for Apple Carbon framework" >&5
+echo "configure:3628: checking for Apple Carbon framework" >&5
cat > conftest.$ac_ext <<EOF
-#line 3631 "configure"
+#line 3630 "configure"
#include "confdefs.h"
#include <Carbon/Carbon.h>
@@ -3638,7 +3637,7 @@ ATSUStyle style;
; return 0; }
EOF
-if { (eval echo configure:3642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -3667,11 +3666,8 @@ rm -f conftest*
else
XETEX_MACOSX='#! '
XETEX_GENERIC=
- fi
-
-
-
+
#
# Check for libfontconfig
#
@@ -3681,19 +3677,19 @@ if test "${with_fontconfig+set}" = set; then
withval="$with_fontconfig"
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
fi
echo $ac_n "checking for fontconfig header files""... $ac_c" 1>&6
-echo "configure:3695: checking for fontconfig header files" >&5
+echo "configure:3691: checking for fontconfig header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3697 "configure"
+#line 3693 "configure"
#include "confdefs.h"
#include <fontconfig/fontconfig.h>
@@ -3704,11 +3700,11 @@ FcObjectSet *os;
; return 0; }
EOF
-if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for FcInit in -lfontconfig""... $ac_c" 1>&6
-echo "configure:3712: checking for FcInit in -lfontconfig" >&5
+echo "configure:3708: checking for FcInit in -lfontconfig" >&5
ac_lib_var=`echo fontconfig'_'FcInit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3716,7 +3712,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfontconfig $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3720 "configure"
+#line 3716 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3727,7 +3723,7 @@ int main() {
FcInit()
; return 0; }
EOF
-if { (eval echo configure:3731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3747,7 +3743,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
#define HAVE_LIBFONTCONFIG 1
EOF
- LDFONTCONFIG="$LDFONTCONFIG -lfontconfig"
+ LDFONTCONFIG="-lfontconfig"
else
echo "$ac_t""no" 1>&6
@@ -3759,13 +3755,24 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
echo "$ac_t""no" 1>&6
- FONTCONFIGCPPFLAGS=
+ CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
LDFONTCONFIG=
fi
rm -f conftest*
+ if test "x$LDFONTCONFIG" = "x"; then
+ { echo "configure: error:
+Cannot build XeTeX without libfontconfig.
+Use the --with-fontconfig=DIR option to specify the prefix where
+fontconfig is installed.
+ " 1>&2; exit 1; }
+ fi
+
+
+
+ fi
fi
@@ -3798,7 +3805,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3802: checking for X" >&5
+echo "configure:3809: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -3860,12 +3867,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 3864 "configure"
+#line 3871 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3935,14 +3942,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3939 "configure"
+#line 3946 "configure"
#include "confdefs.h"
#include <${x_direct_test_include}>
int main() {
${x_direct_test_function}(${x_direct_test_arguments})
; return 0; }
EOF
-if { (eval echo configure:3946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -4048,17 +4055,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4052: checking whether -R must be followed by a space" >&5
+echo "configure:4059: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4062 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -4074,14 +4081,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4078 "configure"
+#line 4085 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -4120,7 +4127,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4124: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4131: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4128,7 +4135,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4132 "configure"
+#line 4139 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4139,7 +4146,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4161,7 +4168,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4165: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4172: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4169,7 +4176,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4173 "configure"
+#line 4180 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4180,7 +4187,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4209,12 +4216,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4213: checking for gethostbyname" >&5
+echo "configure:4220: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4218 "configure"
+#line 4225 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -4237,7 +4244,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -4258,7 +4265,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4262: checking for gethostbyname in -lnsl" >&5
+echo "configure:4269: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4266,7 +4273,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4270 "configure"
+#line 4277 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4277,7 +4284,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4307,12 +4314,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4311: checking for connect" >&5
+echo "configure:4318: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4316 "configure"
+#line 4323 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -4335,7 +4342,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -4356,7 +4363,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4360: checking for connect in -lsocket" >&5
+echo "configure:4367: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4364,7 +4371,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4368 "configure"
+#line 4375 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4375,7 +4382,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4399,12 +4406,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4403: checking for remove" >&5
+echo "configure:4410: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4408 "configure"
+#line 4415 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -4427,7 +4434,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:4431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -4448,7 +4455,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4452: checking for remove in -lposix" >&5
+echo "configure:4459: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4456,7 +4463,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4460 "configure"
+#line 4467 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4467,7 +4474,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:4471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4491,12 +4498,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4495: checking for shmat" >&5
+echo "configure:4502: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4500 "configure"
+#line 4507 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -4519,7 +4526,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:4523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -4540,7 +4547,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4544: checking for shmat in -lipc" >&5
+echo "configure:4551: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4548,7 +4555,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4552 "configure"
+#line 4559 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4559,7 +4566,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4592,7 +4599,7 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4596: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4603: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4600,7 +4607,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4604 "configure"
+#line 4611 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4611,7 +4618,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4644,7 +4651,7 @@ if test "x$with_x" = xyes; then
fi
if test -z "$x_ext_lib"; then # allow envvar override
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4648: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4655: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4652,7 +4659,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $wlibs $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4656 "configure"
+#line 4663 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4663,7 +4670,7 @@ int main() {
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4734,7 +4741,7 @@ test -d tests || mkdir tests
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:4738: checking for main in -lm" >&5
+echo "configure:4745: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4742,14 +4749,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4746 "configure"
+#line 4753 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4854,7 +4861,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4858: checking for $ac_word" >&5
+echo "configure:4865: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TANGLEBOOT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4898,7 +4905,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4902: checking for $ac_word" >&5
+echo "configure:4909: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4942,7 +4949,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4946: checking for $ac_word" >&5
+echo "configure:4953: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CTANGLEBOOT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4986,7 +4993,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4990: checking for $ac_word" >&5
+echo "configure:4997: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CTANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5030,7 +5037,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tie", so it can be a program name with args.
set dummy tie; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5034: checking for $ac_word" >&5
+echo "configure:5041: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TIE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5075,7 +5082,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "otangle", so it can be a program name with args.
set dummy otangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5079: checking for $ac_word" >&5
+echo "configure:5086: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_OTANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5303,10 +5310,11 @@ s%@CXXHACKLDLIBS@%$CXXHACKLDLIBS%g
s%@PTEX@%$PTEX%g
s%@PETEX@%$PETEX%g
s%@XETEX@%$XETEX%g
-s%@XETEX_MACOSX@%$XETEX_MACOSX%g
-s%@XETEX_GENERIC@%$XETEX_GENERIC%g
s%@FONTCONFIGCPPFLAGS@%$FONTCONFIGCPPFLAGS%g
+s%@FONTCONFIGLDFLAGS@%$FONTCONFIGLDFLAGS%g
s%@LDFONTCONFIG@%$LDFONTCONFIG%g
+s%@XETEX_MACOSX@%$XETEX_MACOSX%g
+s%@XETEX_GENERIC@%$XETEX_GENERIC%g
s%@ETEX@%$ETEX%g
s%@X_CFLAGS@%$X_CFLAGS%g
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in
index 198232a3fd1..40ec4974d27 100644
--- a/Build/source/texk/web2c/configure.in
+++ b/Build/source/texk/web2c/configure.in
@@ -308,6 +308,7 @@ fontconfig is installed.
])
fi
AC_SUBST(FONTCONFIGCPPFLAGS)
+ AC_SUBST(FONTCONFIGLDFLAGS)
AC_SUBST(LDFONTCONFIG)
fi
AC_SUBST(XETEX_MACOSX)
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=
]
)
diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk
index 4fdf07a1ba8..b7590af0427 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.mk
+++ b/Build/source/texk/web2c/xetexdir/xetex.mk
@@ -79,6 +79,7 @@ ZLIBDIR = ../../libs/zlib
ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
+FONTCONFIGLDFLAGS = @FONTCONFIGLDFLAGS@
xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDZLIB)
@@ -196,7 +197,7 @@ trans.o: $(srcdir)/xetexdir/trans.c
# Making xetex.
xetex: $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) $(EXTRADEPS)
@CXXHACKLINK@ $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
+ $(FONTCONFIGLDFLAGS) $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
@CXXHACKLDLIBS@ @CXXLDEXTRA@
# C file dependencies