summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx/acinclude.m4
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/xdvipdfmx/acinclude.m4
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/xdvipdfmx/acinclude.m4')
-rw-r--r--Build/source/texk/xdvipdfmx/acinclude.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/xdvipdfmx/acinclude.m4 b/Build/source/texk/xdvipdfmx/acinclude.m4
index 7c6fe1be39f..c99ed5b77a0 100644
--- a/Build/source/texk/xdvipdfmx/acinclude.m4
+++ b/Build/source/texk/xdvipdfmx/acinclude.m4
@@ -126,7 +126,7 @@ png_infop p;
LIBS="$LIBS -lpng" ], , -lz
)
],
- [ AC_MSG_RESULT(no) ]
+ [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]
)
])
@@ -157,7 +157,7 @@ struct paper *p;
LIBS="$LIBS -lpaper"
])
],
- [ AC_MSG_RESULT(no) ]
+ [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]
)
])
@@ -172,6 +172,7 @@ AC_DEFUN([AC_HAS_LIBFONTCONFIG], [
if test -d "$withval"; then
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
+ FONTCONFIGLDFLAGS="-L$withval/lib"
fi
]
)
@@ -188,7 +189,7 @@ FcObjectSet *os;
LIBS="$LIBS -lfontconfig"
])
],
- [ AC_MSG_RESULT(no) ]
+ [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]
)
])
@@ -257,7 +258,6 @@ library and the FreeType2 include files.])
# Check for ApplicationServices
#
AC_DEFUN([AC_HAS_APP_SERVICES], [
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
AC_MSG_CHECKING([for Mac OS X ApplicationServices framework])
AC_TRY_COMPILE(
[