summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-17 22:59:48 +0000
committerKarl Berry <karl@freefriends.org>2018-01-17 22:59:48 +0000
commitdee0b6b664494fc08466c82f61921f9558e6d2fc (patch)
tree1ed52146066f2157bfea440370361c2f7edd06ad /Build/source/texk/dvisvgm
parent3b912a358a0821750b2b6a664f6435d7ff87093a (diff)
reautoconf
git-svn-id: svn://tug.org/texlive/trunk@46354 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/config.h.in3
-rwxr-xr-xBuild/source/texk/dvisvgm/configure80
2 files changed, 70 insertions, 13 deletions
diff --git a/Build/source/texk/dvisvgm/config.h.in b/Build/source/texk/dvisvgm/config.h.in
index 7dd62bf7d94..0e40d614eed 100644
--- a/Build/source/texk/dvisvgm/config.h.in
+++ b/Build/source/texk/dvisvgm/config.h.in
@@ -56,6 +56,9 @@
/* Define to 1 if you have the <iostream> header file. */
#undef HAVE_IOSTREAM
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
/* Define to 1 if you have the `freetype2' library (-lfreetype). */
#undef HAVE_LIBFREETYPE
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 19eb0816eff..4d5b6492e87 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -21813,12 +21813,12 @@ if test "x$enable_native_texlive_build" = xyes; then
# TL: always dlload libgs, must avoid shared lib ref in binary.
HAVE_LIBGS=0
else
-HAVE_LIBGS=1
+have_libgs=yes
ac_fn_c_check_header_mongrel "$LINENO" "ghostscript/iapi.h" "ac_cv_header_ghostscript_iapi_h" "$ac_includes_default"
if test "x$ac_cv_header_ghostscript_iapi_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsapi_new_instance in -lgs" >&5
-$as_echo_n "checking for gsapi_new_instance in -lgs... " >&6; }
-if ${ac_cv_lib_gs_gsapi_new_instance+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsapi_revision in -lgs" >&5
+$as_echo_n "checking for gsapi_revision in -lgs... " >&6; }
+if ${ac_cv_lib_gs_gsapi_revision+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21832,27 +21832,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char gsapi_new_instance ();
+char gsapi_revision ();
int
main ()
{
-return gsapi_new_instance ();
+return gsapi_revision ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gs_gsapi_new_instance=yes
+ ac_cv_lib_gs_gsapi_revision=yes
else
- ac_cv_lib_gs_gsapi_new_instance=no
+ ac_cv_lib_gs_gsapi_revision=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gs_gsapi_new_instance" >&5
-$as_echo "$ac_cv_lib_gs_gsapi_new_instance" >&6; }
-if test "x$ac_cv_lib_gs_gsapi_new_instance" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gs_gsapi_revision" >&5
+$as_echo "$ac_cv_lib_gs_gsapi_revision" >&6; }
+if test "x$ac_cv_lib_gs_gsapi_revision" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGS 1
_ACEOF
@@ -21860,14 +21860,68 @@ _ACEOF
LIBS="-lgs $LIBS"
else
- HAVE_LIBGS=0
+ have_libgs=no
fi
else
- HAVE_LIBGS=0
+ have_libgs=no
fi
+if test "x$have_libgs" = "xno"; then :
+ # Ghostscript not found, check for dlopen
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+ LIBS="-ldl $LIBS"
+
+else
+
+$as_echo "#define DISABLE_GS 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PostScript support disabled" >&5
+$as_echo "$as_me: WARNING: PostScript support disabled" >&2;}
+fi
+
+fi
fi
if test "$HAVE_LIBGS" -eq 0; then