From ec6edaec1a0e77818f0b440eb5157011b44eda1d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 26 May 2009 15:28:05 +0000 Subject: build system: handle --without-x git-svn-id: svn://tug.org/texlive/trunk@13482 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 74 ++++++++++++++++------ Build/source/libs/configure | 34 ++++++++++ Build/source/m4/README | 2 +- Build/source/m4/kpse-setup.m4 | 5 ++ Build/source/texk/configure | 34 ++++++++++ .../source/texk/web2c/omegafonts/Makefile.in.orig | 73 --------------------- Build/source/texk/withenable.ac | 37 ----------- Build/source/texk/xdvik/ac/withenable.ac | 6 ++ Build/source/texk/xdvik/configure | 18 ++++++ Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 | 3 +- Build/source/texk/xdvik/m4/xdvi-find-motif.m4 | 2 +- Build/source/utils/configure | 34 ++++++++++ Build/source/utils/pdfopen/ac/withenable.ac | 6 ++ Build/source/withenable.ac | 24 ------- 14 files changed, 195 insertions(+), 157 deletions(-) delete mode 100644 Build/source/texk/web2c/omegafonts/Makefile.in.orig delete mode 100644 Build/source/texk/withenable.ac delete mode 100644 Build/source/withenable.ac diff --git a/Build/source/configure b/Build/source/configure index 30a32f4042c..7fd6b3bdfa6 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -2495,6 +2495,14 @@ fi +case $with_x in + yes | no) : ;; + *) with_x=yes + { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5 +$as_echo "$as_me: Assuming \`--with-x'" >&6;} + ac_configure_args="$ac_configure_args '--with-x'" ;; +esac + ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. @@ -2512,6 +2520,19 @@ esac ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen +if test "x$with_x" = xno; then + case $enable_pdfopen in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;} + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then enableval=$enable_pdfopen; @@ -3333,6 +3354,19 @@ test "x$enable_xdv2pdf" = xno || { ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik +if test "x$with_x" = xno; then + case $enable_xdvik in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then enableval=$enable_xdvik; @@ -6121,13 +6155,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:6124: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6158: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6127: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6161: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6130: output\"" >&5) + (eval echo "\"\$as_me:6164: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7333,7 +7367,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7336 "configure"' > conftest.$ac_ext + echo '#line 7370 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9279,11 +9313,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:9282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9316: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9286: \$? = $ac_status" >&5 + echo "$as_me:9320: \$? = $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. @@ -9618,11 +9652,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:9621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9655: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9625: \$? = $ac_status" >&5 + echo "$as_me:9659: \$? = $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. @@ -9723,11 +9757,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:9726: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9760: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9730: \$? = $ac_status" >&5 + echo "$as_me:9764: \$? = $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 @@ -9778,11 +9812,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:9781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9815: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9785: \$? = $ac_status" >&5 + echo "$as_me:9819: \$? = $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 @@ -12578,7 +12612,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12581 "configure" +#line 12615 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12674,7 +12708,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12677 "configure" +#line 12711 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19108,11 +19142,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:19111: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19145: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19115: \$? = $ac_status" >&5 + echo "$as_me:19149: \$? = $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. @@ -19207,11 +19241,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:19210: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19214: \$? = $ac_status" >&5 + echo "$as_me:19248: \$? = $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 @@ -19259,11 +19293,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:19262: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19296: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19266: \$? = $ac_status" >&5 + echo "$as_me:19300: \$? = $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 diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 021c56a66b8..86399c171a2 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -2216,6 +2216,14 @@ fi +case $with_x in + yes | no) : ;; + *) with_x=yes + { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5 +$as_echo "$as_me: Assuming \`--with-x'" >&6;} + ac_configure_args="$ac_configure_args '--with-x'" ;; +esac + ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. @@ -2233,6 +2241,19 @@ esac ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen +if test "x$with_x" = xno; then + case $enable_pdfopen in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;} + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then enableval=$enable_pdfopen; @@ -3054,6 +3075,19 @@ test "x$enable_xdv2pdf" = xno || { ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik +if test "x$with_x" = xno; then + case $enable_xdvik in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then enableval=$enable_xdvik; diff --git a/Build/source/m4/README b/Build/source/m4/README index beeb13a3989..b439dae75af 100644 --- a/Build/source/m4/README +++ b/Build/source/m4/README @@ -25,7 +25,7 @@ owned by the TL tree. kpse-pkgs.m4: defines lists of subdirectories libs/Lib/, utils/Util/, and tex/Prog/ with libraries and programs that can be built as part of the TL tree. -kpse-setup.m4: macros that recurse through these lists to provide configure +kpse-setup.m4: macros that walk through these lists to provide configure options. They depend on configure fragments */*/ac/withenable.ac defining the dependencies between these libraries and programs. diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index de7a6e66df2..5b477196aec 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -48,6 +48,11 @@ KPSE_OPTIONS KPSE_ENABLE_CXX_HACK KPSE_LIBS_PREPARE KPSE_WEB2C_PREPARE +AS_CASE([$with_x], + [yes | no], [:], + [with_x=yes + AC_MSG_NOTICE([Assuming `--with-x']) + ac_configure_args="$ac_configure_args '--with-x'"]) KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])]) KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])]) m4_sinclude(kpse_TL[texk/kpathsea/ac/withenable.ac]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 0b2c04daf95..d206404d460 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -2234,6 +2234,14 @@ fi +case $with_x in + yes | no) : ;; + *) with_x=yes + { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5 +$as_echo "$as_me: Assuming \`--with-x'" >&6;} + ac_configure_args="$ac_configure_args '--with-x'" ;; +esac + ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. @@ -2251,6 +2259,19 @@ esac ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen +if test "x$with_x" = xno; then + case $enable_pdfopen in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;} + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then enableval=$enable_pdfopen; @@ -3072,6 +3093,19 @@ test "x$enable_xdv2pdf" = xno || { ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik +if test "x$with_x" = xno; then + case $enable_xdvik in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then enableval=$enable_xdvik; diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in.orig b/Build/source/texk/web2c/omegafonts/Makefile.in.orig deleted file mode 100644 index 9fb8d3f1cf7..00000000000 --- a/Build/source/texk/web2c/omegafonts/Makefile.in.orig +++ /dev/null @@ -1,73 +0,0 @@ -# @configure_input@ -# Makefile for omegafonts. - -# These get expanded from the parent directory, not this one. -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/paths.mk -kpse_include kpathsea.mk - -LEX = @LEX@ -#LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -YACC = @YACC@ - -proglib = ../lib/lib.a -programs = omfonts -linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf -scripts = - -omfonts_objects = omfonts.o y_tab.o $(LEX_OUTPUT_ROOT).o \ - char_routines.o dimen_routines.o error_routines.o \ - header_routines.o ligkern_routines.o list_routines.o \ - out_routines.o param_routines.o print_routines.o \ - font_routines.o extra_routines.o out_ofm.o \ - parse_ofm.o -h_files = char_routines.h dimen_routines.h error_routines.h \ - font_routines.h header_routines.h ligkern_routines.h \ - list_routines.h out_routines.h param_routines.h print_routines.h \ - extra_routines.h manifests.h parser.h out_ofm.h dvi.h \ - parse_ofm.h omfonts.h - -all: $(programs) -$(omfonts_objects): Makefile -omfonts: $(omfonts_objects) - $(kpathsea_link) $(omfonts_objects) $(LEXLIB) $(LOADLIBES) - -omfonts.o: omfonts.c y_tab.h -y_tab.c y_tab.h: pl.y - $(YACC) -d -v $(srcdir)/pl.y - -test -f y.tab.c && mv -f y.tab.c y_tab.c - -test -f y.tab.h && mv -f y.tab.h y_tab.h -$(LEX_OUTPUT_ROOT).o: parser.h y_tab.h -$(LEX_OUTPUT_ROOT).c: pl.l - $(LEX) $(srcdir)/pl.l - - - -$(programs): $(proglib) $(kpathsea) - -$(omfonts_objects): $(h_files) - -install: install-exec -install-exec:: install-links - -install-programs: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - -install-links: install-programs - for f in ""$(linked_programs); do \ - cd $(bindir) && (rm -f $$f; $(LN) omfonts $$f); done - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status - -kpse_include ../make/tkpathsea.mk -kpse_include ../make/clean.mk - -clean:: - rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c - -kpse_include ../make/rdepend.mk -kpse_include omegafonts/depend.mk diff --git a/Build/source/texk/withenable.ac b/Build/source/texk/withenable.ac deleted file mode 100644 index 690443a3fc3..00000000000 --- a/Build/source/texk/withenable.ac +++ /dev/null @@ -1,37 +0,0 @@ -dnl withenable.ac: --with and --enable options. -dnl -dnl list of optional packages in texk/, i.e., subdirs of texk/ -dnl -m4_define([kpse_texk_pkglist], [ -afm2pl -bibtex8 -cjkutils -detex -devnag -dtl -dvi2tty -dvidvi -dviljk -dvipdfmx -dvipng -dvipos -dvipsk -gsftopk -lacheck -lcdf-typetools -makeindexk -musixflx -ps2pkm -seetexk -tetex -tex4htk -texlive -ttf2pk -xdv2pdf -xdvik -xdvipdfmx -])dnl - -# Options to avoid/include the packages in texk/. -# -KPSE_WITH_SUBDIRS(kpse_texk_pkglist) diff --git a/Build/source/texk/xdvik/ac/withenable.ac b/Build/source/texk/xdvik/ac/withenable.ac index 842b417bdaa..2cd92509fe0 100644 --- a/Build/source/texk/xdvik/ac/withenable.ac +++ b/Build/source/texk/xdvik/ac/withenable.ac @@ -6,5 +6,11 @@ dnl dnl extra_dirs = texk/xdvik/squeeze dnl ## configure options and TL libraries required for xdvik +AS_IF([test "x$with_x" = xno], + [AS_CASE([$enable_xdvik], + [""], [AC_MSG_NOTICE([`--without-x' -> `--disable-xdvik']) + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'"], + [yes], [AC_MSG_ERROR([Sorry, incompatible options `--without-x' and `--enable-xdvik'])])]) KPSE_ENABLE_PROG([xdvik], [kpathsea t1lib]) m4_include(kpse_TL[texk/xdvik/ac/xdvik.ac]) diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 7f1b4d79109..0ad6f54f414 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -21396,9 +21396,18 @@ _ACEOF fi elif test "x$default_toolkit" = xnone; then + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building xdvik has been disabled and would fail because +No Motif." >&5 +$as_echo "$as_me: WARNING: building xdvik has been disabled and would fail because +No Motif." >&2;} +else { { $as_echo "$as_me:$LINENO: error: No Motif." >&5 $as_echo "$as_me: error: No Motif." >&2;} { (exit 1); exit 1; }; } +fi + + else # Restore previous X_CFLAGS X_CFLAGS=$xdvi_motif_save_X_CFLAGS @@ -21569,10 +21578,19 @@ cat >>confdefs.h <<\_ACEOF #define XAW 1 _ACEOF +else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building xdvik has been disabled and would fail because +Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5 +$as_echo "$as_me: WARNING: building xdvik has been disabled and would fail because +Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;} else { { $as_echo "$as_me:$LINENO: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5 $as_echo "$as_me: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;} { (exit 1); exit 1; }; } +fi + + fi fi diff --git a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 index 6f7301c6340..ff398530435 100644 --- a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 @@ -75,6 +75,7 @@ if test "x$xdvi_have_xaw" = xyes; then prog_extension="xaw" AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.]) else - AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) + KPSE_MSG_ERROR([xdvik], + [Sorry, you will need at least the Xaw header/library files to compile xdvik.]) fi ]) # XDVI_CHECK_XAW_LIBRARY diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 index 09f8091ce4b..dcdcf8d4971 100644 --- a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 @@ -94,7 +94,7 @@ if test "x$xdvi_have_motif" = xyes; then # Check whether to compile for Motif with Xaw Panner. _XDVI_CHECK_PANNER elif test "x$default_toolkit" = xnone; then - AC_MSG_ERROR([No Motif.]) + KPSE_MSG_ERROR([xdvik], [No Motif.]) else # Restore previous X_CFLAGS X_CFLAGS=$xdvi_motif_save_X_CFLAGS diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 9cc3507c641..ffc38539cec 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -2213,6 +2213,14 @@ fi +case $with_x in + yes | no) : ;; + *) with_x=yes + { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5 +$as_echo "$as_me: Assuming \`--with-x'" >&6;} + ac_configure_args="$ac_configure_args '--with-x'" ;; +esac + ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. @@ -2230,6 +2238,19 @@ esac ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen +if test "x$with_x" = xno; then + case $enable_pdfopen in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;} + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then enableval=$enable_pdfopen; @@ -3051,6 +3072,19 @@ test "x$enable_xdv2pdf" = xno || { ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik +if test "x$with_x" = xno; then + case $enable_xdvik in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then enableval=$enable_xdvik; diff --git a/Build/source/utils/pdfopen/ac/withenable.ac b/Build/source/utils/pdfopen/ac/withenable.ac index af5081f81ca..5aed0888cd2 100644 --- a/Build/source/utils/pdfopen/ac/withenable.ac +++ b/Build/source/utils/pdfopen/ac/withenable.ac @@ -4,4 +4,10 @@ dnl Copyright (C) 2009 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for pdfopen +AS_IF([test "x$with_x" = xno], + [AS_CASE([$enable_pdfopen], + [""], [AC_MSG_NOTICE([`--without-x' -> `--disable-pdfopen']) + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'"], + [yes], [AC_MSG_ERROR([Sorry, incompatible options `--without-x' and `--enable-pdfopen'])])]) KPSE_ENABLE_PROG([pdfopen]) diff --git a/Build/source/withenable.ac b/Build/source/withenable.ac deleted file mode 100644 index e392f7748a9..00000000000 --- a/Build/source/withenable.ac +++ /dev/null @@ -1,24 +0,0 @@ -# withenable.ac - Written long ago by Thomas Esser and Sebastian Rahtz. -# $Id$ -# Public domain. - -AC_ARG_ENABLE([multiplatform], - [AS_HELP_STRING([--enable-multiplatform], - [put executables into bin/PLATFORM and libraries into lib/PLATFORM])])dnl - -dnl list of optional packages in utils/, i.e., subdirs of utils/ -dnl -m4_define([kpse_utils_pkglist], [ -dialog -pdfopen -ps2eps -psutils -t1utils -tpic2pdftex -vlna -xindy -]) - -# Options to avoid/include the packages in utils/. -# -KPSE_WITH_SUBDIRS(kpse_utils_pkglist) -- cgit v1.2.3