summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-xBuild/source/texk/web2c/configure86
1 files changed, 29 insertions, 57 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index eac71aa0320..d142512ce3f 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1015,11 +1015,7 @@ with_fontconfig_includes
with_fontconfig_libdir
with_x
with_system_kpathsea
-with_kpathsea_includes
-with_kpathsea_libdir
with_system_ptexenc
-with_ptexenc_includes
-with_ptexenc_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1763,16 +1759,10 @@ Optional Packages:
--with-fontconfig-libdir=DIR
fontconfig library installed in DIR
--with-x use the X Window System
- --with-system-kpathsea use installed kpathsea headers and library
- --with-kpathsea-includes=DIR
- kpathsea headers installed in DIR
- --with-kpathsea-libdir=DIR
- kpathsea library installed in DIR
- --with-system-ptexenc use installed ptexenc headers and library
- --with-ptexenc-includes=DIR
- ptexenc headers installed in DIR
- --with-ptexenc-libdir=DIR
- ptexenc library installed in DIR
+ --with-system-kpathsea use installed kpathsea headers and library (requires
+ pkg-config)
+ --with-system-ptexenc use installed ptexenc headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -23589,23 +23579,12 @@ ac_link="./libtool --mode=link --tag=CC $ac_link"
if test "${with_system_kpathsea+set}" = set; then :
withval=$with_system_kpathsea;
fi
-
-# Check whether --with-kpathsea-includes was given.
-if test "${with_kpathsea_includes+set}" = set; then :
- withval=$with_kpathsea_includes;
-fi
-
-# Check whether --with-kpathsea-libdir was given.
-if test "${with_kpathsea_libdir+set}" = set; then :
- withval=$with_kpathsea_libdir;
-fi
if test "x$with_system_kpathsea" = xyes; then
- if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then
- KPATHSEA_INCLUDES="-I$with_kpathsea_includes"
-fi
-KPATHSEA_LIBS="-lkpathsea"
-if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then
- KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
+ if $PKG_CONFIG kpathsea; then
+ KPATHSEA_INCLUDES=`$PKG_CONFIG kpathsea --cflags`
+ KPATHSEA_LIBS=`$PKG_CONFIG kpathsea --libs`
+elif test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
+ as_fn_error $? "did not find kpathsea" "$LINENO" 5
fi
else
KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk"
@@ -23626,7 +23605,7 @@ else
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <kpathsea/kpathsea.h>
int
@@ -23644,7 +23623,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS=$kpse_save_CPPFLAGS
+ CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
fi
@@ -23660,23 +23639,12 @@ fi
if test "${with_system_ptexenc+set}" = set; then :
withval=$with_system_ptexenc;
fi
-
-# Check whether --with-ptexenc-includes was given.
-if test "${with_ptexenc_includes+set}" = set; then :
- withval=$with_ptexenc_includes;
-fi
-
-# Check whether --with-ptexenc-libdir was given.
-if test "${with_ptexenc_libdir+set}" = set; then :
- withval=$with_ptexenc_libdir;
-fi
if test "x$with_system_ptexenc" = xyes; then
- if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then
- PTEXENC_INCLUDES="-I$with_ptexenc_includes"
-fi
-PTEXENC_LIBS="-lptexenc"
-if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then
- PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
+ if $PKG_CONFIG ptexenc; then
+ PTEXENC_INCLUDES=`$PKG_CONFIG ptexenc --cflags`
+ PTEXENC_LIBS=`$PKG_CONFIG ptexenc --libs`
+elif test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then
+ as_fn_error $? "did not find ptexenc" "$LINENO" 5
fi
else
PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc"
@@ -23933,7 +23901,7 @@ if test "x$with_system_pixman" = xyes; then
PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then
- as_fn_error $? "did not find pixman-0.18 or better" "$LINENO" 5
+ as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5
fi
else
PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
@@ -23957,7 +23925,7 @@ if test "x$with_system_cairo" = xyes; then
CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags`
CAIRO_LIBS=`$PKG_CONFIG cairo --libs`
elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then
- as_fn_error $? "did not find cairo-1.12 or better" "$LINENO" 5
+ as_fn_error $? "did not find cairo 1.12 or better" "$LINENO" 5
fi
else
CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo"
@@ -24048,12 +24016,14 @@ if test "${with_system_poppler+set}" = set; then :
fi
if test "x$with_system_poppler" = xyes; then
if $PKG_CONFIG poppler --atleast-version=0.18; then
- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
- POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+ POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
- as_fn_error $? "did not find poppler-0.18 or better" "$LINENO" 5
+ as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
fi
+
+POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
else
POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include"
POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a"
@@ -24074,12 +24044,14 @@ if test "${with_system_xpdf+set}" = set; then :
fi
if test "x$with_system_xpdf" = xyes; then
if $PKG_CONFIG poppler --atleast-version=0.12; then
- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
- XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+ XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags`
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
- as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
+ as_fn_error $? "did not find poppler 0.12 or better" "$LINENO" 5
fi
+
+POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES"
else
XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf"
XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a"
@@ -24103,7 +24075,7 @@ if test "x$with_system_zziplib" = xyes; then
ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
- as_fn_error $? "did not find zziplib-0.12 or better" "$LINENO" 5
+ as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5
fi
else
ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include"