summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/xdvik')
-rw-r--r--Build/source/texk/xdvik/Makefile.in24
-rwxr-xr-xBuild/source/texk/xdvik/configure84
-rw-r--r--Build/source/texk/xdvik/squeeze/Makefile.in5
-rwxr-xr-xBuild/source/texk/xdvik/squeeze/configure57
-rw-r--r--Build/source/texk/xdvik/tests/Makefile.in3
5 files changed, 147 insertions, 26 deletions
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 920c7cf71ec..99011ddd086 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -74,6 +74,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -296,6 +297,7 @@ T1LIB_DEPEND = @T1LIB_DEPEND@
T1LIB_INCLUDES = @T1LIB_INCLUDES@
T1LIB_LIBS = @T1LIB_LIBS@
VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
XDVIK_VERSION = @XDVIK_VERSION@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
@@ -365,6 +367,7 @@ x_tool_libs = @x_tool_libs@
x_xmu_lib = @x_xmu_lib@
x_xpm_libs = @x_xpm_libs@
ACLOCAL_AMFLAGS = -I ../../m4 -I m4
+AM_CFLAGS = $(WARNING_CFLAGS)
SUBDIRS = squeeze . tests
x_cppflags = $(X_CFLAGS) $(iconv_includes)
common_includes = $(PS_DEF) $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) $(x_cppflags)
@@ -419,17 +422,16 @@ xdvi_bin_DEPENDENCIES = libxdvi.a $(common_dependencies)
LDADD = libxdvi.a $(common_ldadd)
EXTRA_DIST = psheader.txt mksedscript xdvi.1.in BUGS CHANGES \
ChangeLog.TL FAQ LESSTIF-BUGS README.t1fonts README.t1mapper \
- m4/acinclude.m4 pixmaps/drag_horiz.xbm \
- pixmaps/drag_horiz_mask.xbm pixmaps/drag_omni.xbm \
- pixmaps/drag_omni_mask.xbm pixmaps/drag_vert.xbm \
- pixmaps/drag_vert_mask.xbm pixmaps/fist.xbm \
- pixmaps/fist_mask.xbm pixmaps/hand.xbm pixmaps/hand_mask.xbm \
- pixmaps/magglass.xbm pixmaps/magglass_mask.xbm \
- pixmaps/time16.xbm pixmaps/time16_mask.xbm \
- pixmaps/xdvi16x16.xpm pixmaps/xdvi32x32.xpm \
- pixmaps/xdvi48x48.xpm t1mapper t1mapper.1 texmf-alt/README \
- texmf-alt/charter2.map texmf-alt/lucida.map \
- texmf-alt/marvosym.map texmf-alt/xdvi.cfg \
+ pixmaps/drag_horiz.xbm pixmaps/drag_horiz_mask.xbm \
+ pixmaps/drag_omni.xbm pixmaps/drag_omni_mask.xbm \
+ pixmaps/drag_vert.xbm pixmaps/drag_vert_mask.xbm \
+ pixmaps/fist.xbm pixmaps/fist_mask.xbm pixmaps/hand.xbm \
+ pixmaps/hand_mask.xbm pixmaps/magglass.xbm \
+ pixmaps/magglass_mask.xbm pixmaps/time16.xbm \
+ pixmaps/time16_mask.xbm pixmaps/xdvi16x16.xpm \
+ pixmaps/xdvi32x32.xpm pixmaps/xdvi48x48.xpm t1mapper \
+ t1mapper.1 texmf-alt/README texmf-alt/charter2.map \
+ texmf-alt/lucida.map texmf-alt/marvosym.map texmf-alt/xdvi.cfg \
texmf-alt/xdvifont.map texmf-alt/xypic.map xdvi-search.el \
xdvi.icon xdvizilla xdvizilla.1 Makefile.in-22.84.14 \
acconfig.h-22.84.14 acinclude.m4-22.84.14 aclocal.m4-22.84.14 \
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 0ad6f54f414..439eaf9a1d0 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -817,6 +817,7 @@ XMKMF
LIBOBJS
ALLOCA
PS_DEF
+WARNING_CFLAGS
CPP
OTOOL64
OTOOL
@@ -936,6 +937,7 @@ enable_dependency_tracking
with_gnu_ld
enable_libtool_lock
enable_largefile
+enable_compiler_warnings
with_xdvi_x_toolkit
with_ps
enable_a4
@@ -1612,6 +1614,9 @@ Optional Features:
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-largefile omit support for large files
+ --enable-compiler-warnings=[no|min|yes|max]
+ Turn on compiler warnings [default: yes if
+ maintainer-mode, min otherwise]
--disable-a4 Set default paper size to letter and default unit to
inch
--enable-magick Use ImageMagick to load/render image files.
@@ -4397,13 +4402,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4400: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4405: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4403: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4406: output\"" >&5)
+ (eval echo "\"\$as_me:4411: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5609,7 +5614,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5612 "configure"' > conftest.$ac_ext
+ echo '#line 5617 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6964,6 +6969,21 @@ fi
done
+# Check whether --enable-compiler-warnings was given.
+if test "${enable_compiler_warnings+set}" = set; then
+ enableval=$enable_compiler_warnings;
+fi
+case $enable_compiler_warnings in
+ no | min | yes | max) : ;;
+ *) if test "x$enable_maintainer_mode" = xyes; then
+ enable_compiler_warnings=yes
+else
+ enable_compiler_warnings=min
+fi
+ ;;
+esac
+
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -7555,11 +7575,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7558: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7562: \$? = $ac_status" >&5
+ echo "$as_me:7582: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7894,11 +7914,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7897: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7901: \$? = $ac_status" >&5
+ echo "$as_me:7921: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7999,11 +8019,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8002: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8006: \$? = $ac_status" >&5
+ echo "$as_me:8026: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8054,11 +8074,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8057: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8061: \$? = $ac_status" >&5
+ echo "$as_me:8081: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10854,7 +10874,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10857 "configure"
+#line 10877 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10950,7 +10970,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10953 "configure"
+#line 10973 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12953,6 +12973,42 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
+{ $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+if test "${kpse_cv_warning_cflags+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cflags=
+elif test "x$GCC" = xyes; then
+ kpse_cv_warning_cflags="-Wall -Wunused"
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;;
+esac
+
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wimplicit -Wparentheses -Wreturn-type"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;;
+esac
+
+ fi
+ fi
+else
+ : # FIXME: warning flags for non-gcc compilers
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cflags" >&5
+$as_echo "$kpse_cv_warning_cflags" >&6; }
+WARNING_CFLAGS=$kpse_cv_warning_cflags
+
+
+
+
## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.in b/Build/source/texk/xdvik/squeeze/Makefile.in
index 23953484657..ae36ac67d65 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.in
+++ b/Build/source/texk/xdvik/squeeze/Makefile.in
@@ -47,7 +47,8 @@ DIST_COMMON = $(am__configure_deps) \
../../../build-aux/missing ../../../build-aux/mkinstalldirs \
../../../build-aux/texinfo.tex ../../../build-aux/ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -125,6 +126,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -168,6 +170,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../../m4
+AM_CFLAGS = $(WARNING_CFLAGS)
nodist_noinst_DATA = stamp-squeeze
CLEANFILES = stamp-squeeze
all: all-am
diff --git a/Build/source/texk/xdvik/squeeze/configure b/Build/source/texk/xdvik/squeeze/configure
index 7a6a877313a..86e4a152fb8 100755
--- a/Build/source/texk/xdvik/squeeze/configure
+++ b/Build/source/texk/xdvik/squeeze/configure
@@ -605,6 +605,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WARNING_CFLAGS
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -689,6 +690,7 @@ ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_dependency_tracking
+enable_compiler_warnings
'
ac_precious_vars='build_alias
host_alias
@@ -1328,6 +1330,9 @@ Optional Features:
(and sometimes confusing) to the casual installer
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --enable-compiler-warnings=[no|min|yes|max]
+ Turn on compiler warnings [default: yes if
+ maintainer-mode, min otherwise]
Some influential environment variables:
CC C compiler command
@@ -3458,6 +3463,58 @@ fi
+# Check whether --enable-compiler-warnings was given.
+if test "${enable_compiler_warnings+set}" = set; then
+ enableval=$enable_compiler_warnings;
+fi
+case $enable_compiler_warnings in
+ no | min | yes | max) : ;;
+ *) if test "x$enable_maintainer_mode" = xyes; then
+ enable_compiler_warnings=yes
+else
+ enable_compiler_warnings=min
+fi
+ ;;
+esac
+
+
+{ $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+if test "${kpse_cv_warning_cflags+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cflags=
+elif test "x$GCC" = xyes; then
+ kpse_cv_warning_cflags="-Wall -Wunused"
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;;
+esac
+
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wimplicit -Wparentheses -Wreturn-type"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;;
+esac
+
+ fi
+ fi
+else
+ : # FIXME: warning flags for non-gcc compilers
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cflags" >&5
+$as_echo "$kpse_cv_warning_cflags" >&6; }
+WARNING_CFLAGS=$kpse_cv_warning_cflags
+
+
+
+
+
ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/xdvik/tests/Makefile.in b/Build/source/texk/xdvik/tests/Makefile.in
index 9f79b747af5..1a7d26d5b28 100644
--- a/Build/source/texk/xdvik/tests/Makefile.in
+++ b/Build/source/texk/xdvik/tests/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -170,6 +171,7 @@ T1LIB_DEPEND = @T1LIB_DEPEND@
T1LIB_INCLUDES = @T1LIB_INCLUDES@
T1LIB_LIBS = @T1LIB_LIBS@
VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
XDVIK_VERSION = @XDVIK_VERSION@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
@@ -248,6 +250,7 @@ common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND)
libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
+AM_CFLAGS = $(WARNING_CFLAGS)
TESTS = $(check_PROGRAMS)
run_tests_SOURCES = \
run_tests.c \