diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-06 13:35:05 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-06 13:35:05 +0000 |
commit | 0addcc0b8701a58ec82d3825ff4a687049c37b35 (patch) | |
tree | 0d01a634df7cc019393df638abf7022a07efe0ae /Build/source/texk/lcdf-typetools | |
parent | 24aeb8a67eb65d0e5e1a886e1c59627f1d5930c9 (diff) |
new build system: fix some install dirs, pdftex mingw32 regex library
git-svn-id: svn://tug.org/texlive/trunk@12641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r-- | Build/source/texk/lcdf-typetools/Makefile.am | 12 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/Makefile.in | 59 | ||||
-rwxr-xr-x | Build/source/texk/lcdf-typetools/configure | 58 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/configure.ac | 2 |
4 files changed, 104 insertions, 27 deletions
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index 54f95b59e17..3a64a4c1f75 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -6,8 +6,20 @@ DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea SUBDIRS = $(SELECTED_SUBDIRS) DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 +if tetex_build + +glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist +glyphlist_DATA = glyphlist.txt texglyphlist.txt + +encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base +enc_DATA = 7t.enc + +else !tetex_build + pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc +endif !tetex_build + EXTRA_DIST = \ ONEWS \ lcdf-typetools.spec \ diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index b26764a076e..1eb6e9291a5 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -78,9 +78,12 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" \ + "$(DESTDIR)$(pkgdatadir)" +encDATA_INSTALL = $(INSTALL_DATA) +glyphlistDATA_INSTALL = $(INSTALL_DATA) pkgdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgdata_DATA) +DATA = $(enc_DATA) $(glyphlist_DATA) $(pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags @@ -224,7 +227,11 @@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea SUBDIRS = $(SELECTED_SUBDIRS) DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 -pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc +@tetex_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist +@tetex_build_TRUE@glyphlist_DATA = glyphlist.txt texglyphlist.txt +@tetex_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base +@tetex_build_TRUE@enc_DATA = 7t.enc +@tetex_build_FALSE@pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc EXTRA_DIST = ONEWS lcdf-typetools.spec include/lcdf/bezier.hh \ include/lcdf/clp.h include/lcdf/error.hh \ include/lcdf/filename.hh include/lcdf/globmatch.hh \ @@ -314,6 +321,40 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-encDATA: $(enc_DATA) + @$(NORMAL_INSTALL) + test -z "$(encdir)" || $(MKDIR_P) "$(DESTDIR)$(encdir)" + @list='$(enc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(encDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(encdir)/$$f'"; \ + $(encDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(encdir)/$$f"; \ + done + +uninstall-encDATA: + @$(NORMAL_UNINSTALL) + @list='$(enc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(encdir)/$$f'"; \ + rm -f "$(DESTDIR)$(encdir)/$$f"; \ + done +install-glyphlistDATA: $(glyphlist_DATA) + @$(NORMAL_INSTALL) + test -z "$(glyphlistdir)" || $(MKDIR_P) "$(DESTDIR)$(glyphlistdir)" + @list='$(glyphlist_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(glyphlistDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glyphlistdir)/$$f'"; \ + $(glyphlistDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glyphlistdir)/$$f"; \ + done + +uninstall-glyphlistDATA: + @$(NORMAL_UNINSTALL) + @list='$(glyphlist_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(glyphlistdir)/$$f'"; \ + rm -f "$(DESTDIR)$(glyphlistdir)/$$f"; \ + done install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @@ -621,7 +662,7 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(glyphlistdir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -668,7 +709,8 @@ info: info-recursive info-am: -install-data-am: install-pkgdataDATA +install-data-am: install-encDATA install-glyphlistDATA \ + install-pkgdataDATA install-dvi: install-dvi-recursive @@ -704,7 +746,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-pkgdataDATA +uninstall-am: uninstall-encDATA uninstall-glyphlistDATA \ + uninstall-pkgdataDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ install-strip @@ -717,13 +760,15 @@ uninstall-am: uninstall-pkgdataDATA distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ + install-encDATA install-exec install-exec-am \ + install-glyphlistDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-pkgdataDATA install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-encDATA uninstall-glyphlistDATA \ uninstall-pkgdataDATA diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index a4018414aff..edc1020162d 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -794,6 +794,8 @@ KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS KPATHSEA_INCLUDES +tetex_build_FALSE +tetex_build_TRUE SELECTED_SUBDIRS CXX_HACK_LIBS CXX_HACK_DEPS @@ -4224,13 +4226,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:4227: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4229: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4230: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4232: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4233: output\"" >&5) + (eval echo "\"\$as_me:4235: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5436,7 +5438,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5439 "configure"' > conftest.$ac_ext + echo '#line 5441 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7483,11 +7485,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:7486: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7488: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7490: \$? = $ac_status" >&5 + echo "$as_me:7492: \$? = $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. @@ -7822,11 +7824,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:7825: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7827: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7829: \$? = $ac_status" >&5 + echo "$as_me:7831: \$? = $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. @@ -7927,11 +7929,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:7930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7932: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7934: \$? = $ac_status" >&5 + echo "$as_me:7936: \$? = $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 @@ -7982,11 +7984,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:7985: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7987: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7989: \$? = $ac_status" >&5 + echo "$as_me:7991: \$? = $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 @@ -10782,7 +10784,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10785 "configure" +#line 10787 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10878,7 +10880,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10881 "configure" +#line 10883 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15897,11 +15899,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:15900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15902: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15904: \$? = $ac_status" >&5 + echo "$as_me:15906: \$? = $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. @@ -15996,11 +15998,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:15999: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16001: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16003: \$? = $ac_status" >&5 + echo "$as_me:16005: \$? = $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 @@ -16048,11 +16050,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:16051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16053: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16055: \$? = $ac_status" >&5 + echo "$as_me:16057: \$? = $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 @@ -17965,6 +17967,15 @@ fi test -d $srcdir/../kpathsea && enable_tetex_build=yes + if test "x$enable_tetex_build" = xyes; then + tetex_build_TRUE= + tetex_build_FALSE='#' +else + tetex_build_TRUE='#' + tetex_build_FALSE= +fi + + # Check whether --with-kpathsea was given. if test "${with_kpathsea+set}" = set; then @@ -23100,6 +23111,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${tetex_build_TRUE}" && test -z "${tetex_build_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"tetex_build\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"tetex_build\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${have_kpathsea_TRUE}" && test -z "${have_kpathsea_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"have_kpathsea\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index df1e61a1d28..39ee636dade 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -52,6 +52,8 @@ AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX i dnl FIXME: test -d $srcdir/../kpathsea && enable_tetex_build=yes +AM_CONDITIONAL([tetex_build], [test "x$enable_tetex_build" = xyes]) + AC_ARG_WITH([kpathsea], [AS_HELP_STRING([--without-kpathsea], [build otftotfm without kpathsea])]) |