aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flite/Makefile.am104
-rw-r--r--flite/Makefile.in264
-rw-r--r--flite/aclocal.m41
-rw-r--r--flite/config.h.in15
-rw-r--r--flite/config/Makefile.am59
-rw-r--r--flite/config/Makefile.in126
-rwxr-xr-xflite/configure852
-rw-r--r--flite/configure.ac222
-rw-r--r--flite/flite.c2
l---------flite/m41
l---------flite/pdexternal.am1
11 files changed, 875 insertions, 772 deletions
diff --git a/flite/Makefile.am b/flite/Makefile.am
index 1cec8f7..7ec0528 100644
--- a/flite/Makefile.am
+++ b/flite/Makefile.am
@@ -7,9 +7,17 @@
#-----------------------------------------------------------------------
#-----------------------------------------------------------------------
+# Includes
+#-----------------------------------------------------------------------
+include $(top_srcdir)/pdexternal.am
+
+#-----------------------------------------------------------------------
# Options & Subdirectories
#-----------------------------------------------------------------------
+##-- aclocal options (top level only)
+ACLOCAL_AMFLAGS = -I m4
+
## --- automake options
#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
AUTOMAKE_OPTIONS = foreign
@@ -17,30 +25,15 @@ AUTOMAKE_OPTIONS = foreign
## --- recursion subdirectories
SUBDIRS = config
-## --- pseudo-deps for '.SUFFIXES'
-SUFFIXES = .pod .txt
-
-#-----------------------------------------------------------------------
-# Flags and variables
+##-----------------------------------------------------------------------
+## Pd Externals: hacked _PROGRAMS
#-----------------------------------------------------------------------
-PD_DIR = @PD_DIR@
-PD_INC = @PD_INC@
-PD_DOCDIR = @PD_DOC@
-PD_EXTDIR = @PD_EXTDIR@
-PDEXT = @EXT@
-
-#-----------------------------------------------------------------------
-# pd externals (hacked 'libexec_*')
-#-----------------------------------------------------------------------
-EXEEXT=.@EXT@
-libexecdir = @PD_EXTDIR@
## --- externals
-libexec_PROGRAMS = flite
+pdext_PROGRAMS = flite
## --- documentation
-datadir = @PD_DOCDIR@
-data_DATA = flite-help.pd
+pddoc_DATA = flite-help.pd
#-----------------------------------------------------------------------
# sources
@@ -50,90 +43,21 @@ flite_SOURCES = flite.c mooPdUtils.h
#-----------------------------------------------------------------------
# external compilation : flags
#-----------------------------------------------------------------------
-DEFS = @DEFS@
-AFLAGS = @AFLAGS@
-DFLAGS = @DFLAGS@
-LFLAGS = @LFLAGS@
-WFLAGS = @WFLAGS@
-OFLAGS = @OFLAGS@
-
-AM_CPPFLAGS = $(DEFS) $(IFLAGS) $(DFLAGS)
-AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS)
flite_LDFLAGS = $(LFLAGS)
flite_LDADD = $(FLITE_VOICELIBS) $(FLITE_LANGLIBS) $(FLITE_LEXLIBS) $(FLITE_LIBS)
#-----------------------------------------------------------------------
-# Variables: cleanup
-#-----------------------------------------------------------------------
-## --- mostlyclean: built by 'make' & commonly rebuilt
-#MOSTLYCLEANFILES =
-
-## --- clean: built by 'make'
-#CLEANFILES =
-
-## --- distclean: built by 'configure'
-DISTCLEANFILES = \
- config.log \
- config.cache \
- config.status
-
-## -- maintainerclean: built by maintainer / by hand
-MAINTAINERCLEANFILES = *~ \
- $(PODS:.pod=.txt) \
- Makefile Makefile.in \
- aclocal.m4 \
- configure \
- install-sh \
- stamp-h.in \
- config.h.in
-
-maintainer-clean-local:
- rm -rf autom4te.cache
-
-#CVSCLEAN_SUBDIRS = $(SUBDIRS)
-
-#CVSCLEANFILES = Makefile.in Makefile
-
-
-#-----------------------------------------------------------------------
# Additional Variables & Rules: PODS
#-----------------------------------------------------------------------
PODS = README.pod
-.pod.txt:
- pod2text $< $@
-
+all-local: $(PODS:.pod=.txt)
#-----------------------------------------------------------------------
# Variables: distribution
#-----------------------------------------------------------------------
## --- extra distribution files
-EXTRA_DIST = $(PODS:.pod=.txt) $(data_DATA) autogen.sh configure \
- COPYING flite-1.1-noaudio.patch
-
-## --- recursion subdirectories for 'make dist'
-DIST_SUBDIRS = $(SUBDIRS)
-
-## --- dist-hook: when another 'Makefile.am' is overkill
-#DISTHOOK_DIRS = foo
-#DISTHOOK_FILES = foo/bar.txt foo/baz.txt
-#dist-hook:
-# for d in $(DISTHOOK_DIRS); do\
-# mkdir -p $(distdir)/$$d ;\
-# done
-# for f in $(DISTHOOK_FILES); do\
-# cp -p $(srcdir)/$$f $(distdir)/$$f ;\
-# done
-
-#dist-bz2: dist-bzip2 ;
-
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
+EXTRA_DIST += flite-1.1-noaudio.patch
diff --git a/flite/Makefile.in b/flite/Makefile.in
index ec43d47..83e503d 100644
--- a/flite/Makefile.in
+++ b/flite/Makefile.in
@@ -22,9 +22,10 @@
# Process this file with Automake to create Makefile.in.
#-----------------------------------------------------------------------
-#-----------------------------------------------------------------------
-# Options & Subdirectories
-#-----------------------------------------------------------------------
+#ACLOCAL_AMFLAGS = -I m4
+
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+#AUTOMAKE_OPTIONS = foreign
srcdir = @srcdir@
@@ -47,13 +48,14 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-libexec_PROGRAMS = flite$(EXEEXT)
-subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure COPYING
+ $(top_srcdir)/configure $(top_srcdir)/pdexternal.am COPYING
+pdext_PROGRAMS = flite$(EXEEXT)
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.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 \
@@ -61,9 +63,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(datadir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(libexec_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(pdextdir)" "$(DESTDIR)$(pddocdir)"
+pdextPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(pdext_PROGRAMS)
am_flite_OBJECTS = flite.$(OBJEXT)
flite_OBJECTS = $(am_flite_OBJECTS)
am__DEPENDENCIES_1 =
@@ -90,10 +92,11 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(data_DATA)
+pddocDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pddoc_DATA)
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -106,7 +109,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AFLAGS = @AFLAGS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -121,43 +123,32 @@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEBUG = @DEBUG@
-
-#-----------------------------------------------------------------------
-# external compilation : flags
-#-----------------------------------------------------------------------
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DFLAGS = @DFLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-
-#-----------------------------------------------------------------------
-# pd externals (hacked 'libexec_*')
-#-----------------------------------------------------------------------
-EXEEXT = .@EXT@
-EXT = @EXT@
+ENABLE_DEBUG = @ENABLE_DEBUG@
+EXEEXT = .@PDEXT@
FLITE_LANGLIBS = @FLITE_LANGLIBS@
FLITE_LEXLIBS = @FLITE_LEXLIBS@
FLITE_LIBS = @FLITE_LIBS@
FLITE_VOICELIBS = @FLITE_VOICELIBS@
-IFLAGS = @IFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LFLAGS = @LFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
-OFLAGS = @OFLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -165,19 +156,19 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-
-#-----------------------------------------------------------------------
-# Flags and variables
-#-----------------------------------------------------------------------
-PD_DIR = @PD_DIR@
-PD_DOCDIR = @PD_DOC@
-PD_EXTDIR = @PD_EXTDIR@
-PD_INC = @PD_INC@
+PDEXT = @PDEXT@
+PDEXT_AFLAGS = @PDEXT_AFLAGS@
+PDEXT_DFLAGS = @PDEXT_DFLAGS@
+PDEXT_IFLAGS = @PDEXT_IFLAGS@
+PDEXT_LFLAGS = @PDEXT_LFLAGS@
+PDEXT_OFLAGS = @PDEXT_OFLAGS@
+PDEXT_WFLAGS = @PDEXT_WFLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-WFLAGS = @WFLAGS@
+WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@
+WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -188,7 +179,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
-datadir = @PD_DOCDIR@
+datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -199,13 +190,20 @@ includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
-libexecdir = @PD_EXTDIR@
+libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pd_buildext = @pd_buildext@
+pddir = @pddir@
+pddocdir = @pddocdir@
+pdexecdir = @pdexecdir@
+pdextdir = @pdextdir@
+pdexternsdir = @pdexternsdir@
pdfdir = @pdfdir@
+pdincludedir = @pdincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -213,29 +211,21 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+DEXT = @PDEXT@
+SUFFIXES = .@PDEXT@ .pod .txt .html
-#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config
-SUFFIXES = .pod .txt
-PDEXT = @EXT@
-data_DATA = flite-help.pd
-
-#-----------------------------------------------------------------------
-# sources
#-----------------------------------------------------------------------
-flite_SOURCES = flite.c mooPdUtils.h
-AM_CPPFLAGS = $(DEFS) $(IFLAGS) $(DFLAGS)
-AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS)
-flite_LDFLAGS = $(LFLAGS)
-flite_LDADD = $(FLITE_VOICELIBS) $(FLITE_LANGLIBS) $(FLITE_LEXLIBS) $(FLITE_LIBS)
-
-#-----------------------------------------------------------------------
-# Variables: cleanup
+# Variables: distribution
#-----------------------------------------------------------------------
-#MOSTLYCLEANFILES =
-
-#CLEANFILES =
+EXTRA_DIST = $(PODS) $(PODS:.pod=.txt) $(pddoc_DATA) $(pdext_DATA) \
+ $(pdexterns_DATA) $(pdexec_DATA) $(wildcard COPYING) \
+ $(wildcard Changes) $(wildcard ChangeLog) $(wildcard \
+ README.cvs) $(wildcard depcomp) $(wildcard install-sh) \
+ $(wildcard ltmain.sh) $(wildcard mising) $(wildcard \
+ mkinstalldirs) flite-1.1-noaudio.patch
+
+#all-local: $(PODS:.pod=.txt)
+CLEANFILES = *.$(PDEXT)
DISTCLEANFILES = \
config.log \
config.cache \
@@ -243,38 +233,61 @@ DISTCLEANFILES = \
MAINTAINERCLEANFILES = *~ \
$(PODS:.pod=.txt) \
- Makefile Makefile.in \
+ Makefile \
+ Makefile.in \
aclocal.m4 \
+ compile \
configure \
+ config.h.in \
+ config.guess \
+ config.sub \
+ depcomp \
install-sh \
+ ltmain.sh \
+ missing \
+ mkinstalldirs \
stamp-h.in \
- config.h.in
+ texinfo.tex \
+ ylwrap
-#CVSCLEAN_SUBDIRS = $(SUBDIRS)
+#-----------------------------------------------------------------------
+# Includes
+#-----------------------------------------------------------------------
-#CVSCLEANFILES = Makefile.in Makefile
+#-----------------------------------------------------------------------
+# Options & Subdirectories
+#-----------------------------------------------------------------------
+ACLOCAL_AMFLAGS = -I m4
+
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = config
+pddoc_DATA = flite-help.pd
#-----------------------------------------------------------------------
-# Additional Variables & Rules: PODS
+# sources
#-----------------------------------------------------------------------
-PODS = README.pod
+flite_SOURCES = flite.c mooPdUtils.h
#-----------------------------------------------------------------------
-# Variables: distribution
+# external compilation : flags
#-----------------------------------------------------------------------
-EXTRA_DIST = $(PODS:.pod=.txt) $(data_DATA) autogen.sh configure \
- COPYING flite-1.1-noaudio.patch
+flite_LDFLAGS = $(LFLAGS)
+flite_LDADD = $(FLITE_VOICELIBS) $(FLITE_LANGLIBS) $(FLITE_LEXLIBS) $(FLITE_LIBS)
-DIST_SUBDIRS = $(SUBDIRS)
+#-----------------------------------------------------------------------
+# Additional Variables & Rules: PODS
+#-----------------------------------------------------------------------
+PODS = README.pod
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .pod .txt .c .o .obj
+.SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -322,29 +335,29 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
+install-pdextPROGRAMS: $(pdext_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
- @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ test -z "$(pdextdir)" || $(mkdir_p) "$(DESTDIR)$(pdextdir)"
+ @list='$(pdext_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(pdextPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pdextdir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(pdextPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pdextdir)/$$f" || exit 1; \
else :; fi; \
done
-uninstall-libexecPROGRAMS:
+uninstall-pdextPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ @list='$(pdext_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(pdextdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pdextdir)/$$f"; \
done
-clean-libexecPROGRAMS:
- -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+clean-pdextPROGRAMS:
+ -test -z "$(pdext_PROGRAMS)" || rm -f $(pdext_PROGRAMS)
flite$(EXEEXT): $(flite_OBJECTS) $(flite_DEPENDENCIES)
@rm -f flite$(EXEEXT)
$(LINK) $(flite_LDFLAGS) $(flite_OBJECTS) $(flite_LDADD) $(LIBS)
@@ -371,22 +384,22 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
uninstall-info-am:
-install-dataDATA: $(data_DATA)
+install-pddocDATA: $(pddoc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
- @list='$(data_DATA)'; for p in $$list; do \
+ test -z "$(pddocdir)" || $(mkdir_p) "$(DESTDIR)$(pddocdir)"
+ @list='$(pddoc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+ echo " $(pddocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pddocdir)/$$f'"; \
+ $(pddocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pddocdir)/$$f"; \
done
-uninstall-dataDATA:
+uninstall-pddocDATA:
@$(NORMAL_UNINSTALL)
- @list='$(data_DATA)'; for p in $$list; do \
+ @list='$(pddoc_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
- rm -f "$(DESTDIR)$(datadir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(pddocdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pddocdir)/$$f"; \
done
# This directory's subdirectories are mostly independent; you can cd
@@ -524,6 +537,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkdir_p) $(distdir)/m4
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -664,10 +678,10 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
+all-am: Makefile $(PROGRAMS) $(DATA) config.h all-local
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(datadir)"; do \
+ for dir in "$(DESTDIR)$(pdextdir)" "$(DESTDIR)$(pddocdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -687,6 +701,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -698,7 +713,7 @@ maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
-clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-pdextPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -717,9 +732,9 @@ info: info-recursive
info-am:
-install-data-am: install-dataDATA
+install-data-am: install-pddocDATA install-pdextPROGRAMS
-install-exec-am: install-libexecPROGRAMS
+install-exec-am:
install-info: install-info-recursive
@@ -747,53 +762,44 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dataDATA uninstall-info-am \
- uninstall-libexecPROGRAMS
+uninstall-am: uninstall-info-am uninstall-pddocDATA \
+ uninstall-pdextPROGRAMS
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libexecPROGRAMS \
- clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-dataDATA install-exec install-exec-am install-info \
- install-info-am install-libexecPROGRAMS install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-local maintainer-clean-recursive mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-dataDATA uninstall-info-am uninstall-libexecPROGRAMS
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
+ am--refresh check check-am clean clean-generic \
+ clean-pdextPROGRAMS clean-recursive ctags ctags-recursive dist \
+ dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-recursive distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-pddocDATA \
+ install-pdextPROGRAMS install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-local \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ uninstall-pddocDATA uninstall-pdextPROGRAMS
-maintainer-clean-local:
- rm -rf autom4te.cache
-
.pod.txt:
pod2text $< $@
-#DISTHOOK_DIRS = foo
-#DISTHOOK_FILES = foo/bar.txt foo/baz.txt
-#dist-hook:
-# for d in $(DISTHOOK_DIRS); do\
-# mkdir -p $(distdir)/$$d ;\
-# done
-# for f in $(DISTHOOK_FILES); do\
-# cp -p $(srcdir)/$$f $(distdir)/$$f ;\
-# done
+.pod.html:
+ pod2html $< --outfile=$@
-#dist-bz2: dist-bzip2 ;
+maintainer-clean-local:
+ rm -rf autom4te.cache
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
.PHONY: cvsclean cvsclean-hook
cvsclean: maintainer-clean ;
+
+all-local: $(PODS:.pod=.txt)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/flite/aclocal.m4 b/flite/aclocal.m4
index b7a0e85..4ab8160 100644
--- a/flite/aclocal.m4
+++ b/flite/aclocal.m4
@@ -889,3 +889,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([m4/ax_pd_external.m4])
diff --git a/flite/config.h.in b/flite/config.h.in
index 3ed043c..408e97f 100644
--- a/flite/config.h.in
+++ b/flite/config.h.in
@@ -17,6 +17,12 @@
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
+/* Date this package was configured */
+#undef PACKAGE_BUILD_DATE
+
+/* User who configured this package */
+#undef PACKAGE_BUILD_USER
+
/* Define to the full name of this package. */
#undef PACKAGE_NAME
@@ -29,14 +35,11 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* User who compiled this external */
-#undef PDFLITE_COMPILED_BY
-
-/* When this external was compiled */
-#undef PDFLITE_COMPILED_ON
-
/* This is the function we will call to register the synth voice */
#undef PDFLITE_REGISTER_VOICE
/* Version number of package */
#undef VERSION
+
+/* Define this if you are building single-object externals */
+#undef WANT_OBJECT_EXTERNALS
diff --git a/flite/config/Makefile.am b/flite/config/Makefile.am
index b8bb3bd..81998be 100644
--- a/flite/config/Makefile.am
+++ b/flite/config/Makefile.am
@@ -6,62 +6,7 @@
## Process this file with Automake to create Makefile.in.
##-----------------------------------------------------------------------
-##-----------------------------------------------------------------------
-## Variables: options
-##-----------------------------------------------------------------------
-
-##-----------------------------------------------------------------------
-## Variables: cleanup
-##-----------------------------------------------------------------------
-
-## --- mostlyclean: built by 'make' & commonly rebuilt
-#MOSTLYCLEANFILES =
-
-## --- clean: built by 'make'
-#CLEANFILES =
-
-## --- distclean: built by 'configure'
-#DISTCLEANFILES =
-
-## -- maintainerclean: built by maintainer / by hand
-MAINTAINERCLEANFILES = \
- *~ .*~ \
- compile Makefile Makefile.in \
- config.guess \
- config.sub \
- depcomp \
- install-sh \
- ltmain.sh \
- missing \
- mkinstalldirs \
- texinfo.tex \
- ylwrap
-
-
-##-----------------------------------------------------------------------
-## Variables: distribution
-##-----------------------------------------------------------------------
-
-## --- extra distribution files
-EXTRA_DIST = \
- Makefile.in \
- depcomp \
- install-sh \
- $(wildcard mkinstalldirs) \
- missing
-
-# mkinstalldirs
-# config.guess
-# config.sub
-# ltmain.sh
-# texinfo.tex
-
-## --- recursion subdirectories for 'make dist'
-#DIST_SUBDIRS = $(SUBDIRS)
-
#-----------------------------------------------------------------------
-# Rules: cleanup
+# Includes
#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
+include $(top_srcdir)/pdexternal.am
diff --git a/flite/config/Makefile.in b/flite/config/Makefile.in
index 266de54..67b4c65 100644
--- a/flite/config/Makefile.in
+++ b/flite/config/Makefile.in
@@ -14,11 +14,10 @@
@SET_MAKE@
-#MOSTLYCLEANFILES =
+#ACLOCAL_AMFLAGS = -I m4
-#CLEANFILES =
-
-#DISTCLEANFILES =
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+#AUTOMAKE_OPTIONS = foreign
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -39,11 +38,12 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/pdexternal.am depcomp install-sh missing
subdir = config
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in depcomp \
- install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -53,7 +53,6 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AFLAGS = @AFLAGS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -70,33 +69,30 @@ CYGPATH_W = @CYGPATH_W@
DEBUG = @DEBUG@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DFLAGS = @DFLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-EXT = @EXT@
+ENABLE_DEBUG = @ENABLE_DEBUG@
+EXEEXT = .@PDEXT@
FLITE_LANGLIBS = @FLITE_LANGLIBS@
FLITE_LEXLIBS = @FLITE_LEXLIBS@
FLITE_LIBS = @FLITE_LIBS@
FLITE_VOICELIBS = @FLITE_VOICELIBS@
-IFLAGS = @IFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LFLAGS = @LFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
-OFLAGS = @OFLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -104,15 +100,19 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PD_DIR = @PD_DIR@
-PD_DOCDIR = @PD_DOCDIR@
-PD_EXTDIR = @PD_EXTDIR@
-PD_INC = @PD_INC@
+PDEXT = @PDEXT@
+PDEXT_AFLAGS = @PDEXT_AFLAGS@
+PDEXT_DFLAGS = @PDEXT_DFLAGS@
+PDEXT_IFLAGS = @PDEXT_IFLAGS@
+PDEXT_LFLAGS = @PDEXT_LFLAGS@
+PDEXT_OFLAGS = @PDEXT_OFLAGS@
+PDEXT_WFLAGS = @PDEXT_WFLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-WFLAGS = @WFLAGS@
+WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@
+WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -140,7 +140,14 @@ localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pd_buildext = @pd_buildext@
+pddir = @pddir@
+pddocdir = @pddocdir@
+pdexecdir = @pdexecdir@
+pdextdir = @pdextdir@
+pdexternsdir = @pdexternsdir@
pdfdir = @pdfdir@
+pdincludedir = @pdincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -148,9 +155,41 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-MAINTAINERCLEANFILES = \
- *~ .*~ \
- compile Makefile Makefile.in \
+DEXT = @PDEXT@
+SUFFIXES = .@PDEXT@ .pod .txt .html
+EXTRA_DIST = \
+ $(PODS) \
+ $(PODS:.pod=.txt) \
+ $(pddoc_DATA) \
+ $(pdext_DATA) \
+ $(pdexterns_DATA) \
+ $(pdexec_DATA) \
+ $(wildcard COPYING) \
+ $(wildcard Changes) \
+ $(wildcard ChangeLog) \
+ $(wildcard README.cvs) \
+ $(wildcard depcomp) \
+ $(wildcard install-sh) \
+ $(wildcard ltmain.sh) \
+ $(wildcard mising) \
+ $(wildcard mkinstalldirs)
+
+
+#all-local: $(PODS:.pod=.txt)
+CLEANFILES = *.$(PDEXT)
+DISTCLEANFILES = \
+ config.log \
+ config.cache \
+ config.status
+
+MAINTAINERCLEANFILES = *~ \
+ $(PODS:.pod=.txt) \
+ Makefile \
+ Makefile.in \
+ aclocal.m4 \
+ compile \
+ configure \
+ config.h.in \
config.guess \
config.sub \
depcomp \
@@ -158,20 +197,15 @@ MAINTAINERCLEANFILES = \
ltmain.sh \
missing \
mkinstalldirs \
+ stamp-h.in \
texinfo.tex \
ylwrap
-EXTRA_DIST = \
- Makefile.in \
- depcomp \
- install-sh \
- $(wildcard mkinstalldirs) \
- missing
-
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+.SUFFIXES: .@PDEXT@ .pod .txt .html
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -209,6 +243,7 @@ CTAGS:
distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -256,9 +291,11 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,7 +331,8 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+ maintainer-clean-local
mostlyclean: mostlyclean-am
@@ -315,25 +353,27 @@ uninstall-am: uninstall-info-am
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-local mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
-# mkinstalldirs
-# config.guess
-# config.sub
-# ltmain.sh
-# texinfo.tex
+.pod.txt:
+ pod2text $< $@
-#DIST_SUBDIRS = $(SUBDIRS)
+.pod.html:
+ pod2html $< --outfile=$@
+
+maintainer-clean-local:
+ rm -rf autom4te.cache
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
.PHONY: cvsclean cvsclean-hook
cvsclean: maintainer-clean ;
+
+#-----------------------------------------------------------------------
+# Includes
+#-----------------------------------------------------------------------
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/flite/configure b/flite/configure
index 4a1bfcf..d44b1a0 100755
--- a/flite/configure
+++ b/flite/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pdflite 0.02.
+# Generated by GNU Autoconf 2.61 for pdflite 0.02-1.
#
# Report bugs to <moocow@ling.uni-potsdam.de>.
#
@@ -574,11 +574,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='pdflite'
PACKAGE_TARNAME='pdflite'
-PACKAGE_VERSION='0.02'
-PACKAGE_STRING='pdflite 0.02'
+PACKAGE_VERSION='0.02-1'
+PACKAGE_STRING='pdflite 0.02-1'
PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
-ac_default_prefix=/usr/local/lib/pd
+ac_default_prefix=/usr/local
ac_subst_vars='SHELL
PATH_SEPARATOR
PACKAGE_NAME
@@ -637,6 +637,9 @@ am__leading_dot
AMTAR
am__tar
am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
CC
CFLAGS
LDFLAGS
@@ -653,22 +656,26 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
-AFLAGS
-DFLAGS
-IFLAGS
-LFLAGS
-OFLAGS
-WFLAGS
-LD
-EXT
+LN_S
BUGREPORT
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-PD_DIR
-PD_INC
-PD_EXTDIR
-PD_DOCDIR
+pd_buildext
+pddir
+pddocdir
+pdincludedir
+pdextdir
+pdexternsdir
+pdexecdir
+WANT_OBJECT_EXTERNALS_TRUE
+WANT_OBJECT_EXTERNALS_FALSE
+ENABLE_DEBUG
+LD
+PDEXT
+PDEXT_AFLAGS
+PDEXT_DFLAGS
+PDEXT_IFLAGS
+PDEXT_LFLAGS
+PDEXT_OFLAGS
+PDEXT_WFLAGS
FLITE_LIBS
FLITE_LEXLIBS
FLITE_LANGLIBS
@@ -1187,7 +1194,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pdflite 0.02 to adapt to many kinds of systems.
+\`configure' configures pdflite 0.02-1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,27 +1260,28 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pdflite 0.02:";;
+ short | recursive ) echo "Configuration of pdflite 0.02-1:";;
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
--enable-maintainer-mode enable make rules and dependencies not useful
(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-object-externals
+ Whether to build single-object externals
+ (default=no)
--enable-debug build debug version (default=no)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pd-dir=DIR PD base directory (default=/usr/local/pd)
- --with-pd-include=DIR PD include directory (default=${PD_DIR}/src)
- --with-pd-externs=DIR PD externals directory (default=${PD_DIR}/externs)
- --with-pd-doc=DIR PD documentation directory
- (default=${PD_DIR}/doc/5.reference)
+ --with-pd-dir=DIR Pd base directory (default=PREFIX/pd)
+ --with-pd-include=DIR Pd include directory (default=NONE)
+ --with-pd-extdir=DIR Directory for Pd externals (default=PDDIR/externs)
--with-flite-dir=DIR Flite source directory (default=none)
Some influential environment variables:
@@ -1349,7 +1357,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pdflite configure 0.02
+pdflite configure 0.02-1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1363,7 +1371,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pdflite $as_me 0.02, which was
+It was created by pdflite $as_me 0.02-1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1717,6 +1725,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+##-- Additional m4 macros
+
+
+##-- source & aux
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
if test -f "$ac_dir/install-sh"; then
@@ -1749,6 +1761,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+##-- save user's CFLAGS,CPPFLAGS
+UCPPFLAGS="$CPPFLAGS"
+UCFLAGS="$CFLAGS"
+ULDFLAGS="$LDFLAGS"
+ULIBS="$LIBS"
+
+##-- use automake, autoheader
am__api_version="1.9"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2035,7 +2054,7 @@ fi
# Define the identity of the package.
PACKAGE=pdflite
- VERSION=0.02
+ VERSION=0.02-1
cat >>confdefs.h <<_ACEOF
@@ -2181,19 +2200,117 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
ac_config_headers="$ac_config_headers config.h"
+##-- Default prefix
-##-- save user *FLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-ULIBS="$LIBS"
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi
-ac_ext=c
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Pd external checks
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## prerequisites
+
+
+ ##-- save user's CFLAGS,CPPFLAGS (do this before calling AX_PD_EXTERNAL!)
+ #test -z "$UCPPFLAGS" && UCPPFLAGS="$CPPFLAGS"
+ #test -z "$UCFLAGS" && UCFLAGS="$CFLAGS"
+ #test -z "$ULDFLAGS" && ULDFLAGS="$LDFLAGS"
+
+ ##-- Programs, prefix
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3111,71 +3228,6 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
-
depcc="$CC" am_compiler_list=
@@ -3286,7 +3338,7 @@ else
fi
-# Find a good install program. We prefer a C program (faster),
+ # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
@@ -3366,104 +3418,394 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ { echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
+fi
+ ##-- use libtool (but don't build static libraries)
+ ## + in Makefile.am, do:
+ ## pdexterns_LTLIBRARIES = ext1.la ...
+ ## ext1_la_SOURCES = ...
+ ## ext1_la_LDFLAGS = -module
+ ## + still unclear how to get *.$(PDEXT) targets built from *.la
+ ## /prerequisites
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## versioning
+ ## /versioning
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## hack EXEEXT (alternative to using libtool)
+ { echo "$as_me:$LINENO: checking how to hack automake EXEEXT conventions" >&5
+echo $ECHO_N "checking how to hack automake EXEEXT conventions... $ECHO_C" >&6; }
+ case "${am__api_version}" in
+ 1.[0-4]*)
+ { echo "$as_me:$LINENO: result: automake v${ap__api_version}: on install" >&5
+echo "${ECHO_T}automake v${ap__api_version}: on install" >&6; }
+ pd_buildext=""
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: automake v${am__api_version}: on build" >&5
+echo "${ECHO_T}automake v${am__api_version}: on build" >&6; }
+ pd_buildext="\$(EXEEXT)"
+ ;;
+ esac
+ ## /hack EXEEXT
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## pd-directory/ies
+# Check whether --with-pd-dir was given.
+if test "${with_pd_dir+set}" = set; then
+ withval=$with_pd_dir; pddir="$withval"
+else
+ pddir="\${prefix}/pd"
+fi
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
- # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+
+ pddocdir="${pddir}/doc/5.reference"
+
+
+ ##-- pdincludedir
+
+# Check whether --with-pd-include was given.
+if test "${with_pd_include+set}" = set; then
+ withval=$with_pd_include; pdincludedir="$withval"
else
- USE_MAINTAINER_MODE=no
+ pdincludedir=""
fi
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test -n "$pdincludedir" ; then
+ IFLAGS="$IFLAGS -I$pdincludedir"
+ fi
-if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
+ ##-- pdextdir
+
+# Check whether --with-pd-extdir was given.
+if test "${with_pd_extdir+set}" = set; then
+ withval=$with_pd_extdir; pdextdir="$withval"
else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
+ pdextdir="$pddir/externs"
fi
- MAINT=$MAINTAINER_MODE_TRUE
+ ##-- pdextdir: aliases
+ pdexternsdir="$pdextdir"
+ pdexecdir="$pdextdir"
-##-- banner stuff
-compiled_by="${LOGNAME:-${USER:-(unknown)}}"
-compiled_on="`date`"
-test -z "$compiled_on" && compiled_on="?"
+ ## pd-directory/ies
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-cat >>confdefs.h <<_ACEOF
-#define PDFLITE_COMPILED_BY "$compiled_by"
-_ACEOF
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## single-object-externals?
+ # Check whether --enable-object-externals was given.
+if test "${enable_object_externals+set}" = set; then
+ enableval=$enable_object_externals; want_object_externals="$enableval"
+else
+ want_object_externals="no"
+fi
-cat >>confdefs.h <<_ACEOF
-#define PDFLITE_COMPILED_ON "$compiled_on"
+ { echo "$as_me:$LINENO: checking whether to build single-object externals" >&5
+echo $ECHO_N "checking whether to build single-object externals... $ECHO_C" >&6; }
+ if test "$want_object_externals" != "no" ; then
+ ##-- single-objects
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define WANT_OBJECT_EXTERNALS 1
_ACEOF
+ else
+ ##-- multi-lib only
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+ ##-- add automake conditional for object externals
-# Check whether --with-pd-dir was given.
-if test "${with_pd_dir+set}" = set; then
- withval=$with_pd_dir; PD_DIR="$withval"
+
+if test "$want_object_externals" != "no"; then
+ WANT_OBJECT_EXTERNALS_TRUE=
+ WANT_OBJECT_EXTERNALS_FALSE='#'
else
- PD_DIR="/usr/local/pd"
+ WANT_OBJECT_EXTERNALS_TRUE='#'
+ WANT_OBJECT_EXTERNALS_FALSE=
fi
+ ##
+ ## single-object-externals?
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## check: m_pd.h
+ CPPFLAGS="$CPPFLAGS $IFLAGS"
+ { echo "$as_me:$LINENO: checking for m_pd.h" >&5
+echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_m_pd_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* nonempty includes: compile only */
-# Check whether --with-pd-include was given.
-if test "${with_pd_include+set}" = set; then
- withval=$with_pd_include; PD_INC="$withval"
+#include <m_pd.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_m_pd_h=yes
else
- PD_INC="${PD_DIR}/src"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_m_pd_h=no
fi
-IFLAGS="$IFLAGS -I${PD_INC}"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_m_pd_h" >&5
+echo "${ECHO_T}$ac_cv_header_m_pd_h" >&6; }
+if test $ac_cv_header_m_pd_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: could not find Pd header file 'm_pd.h' - bailing out" >&5
+echo "$as_me: error: could not find Pd header file 'm_pd.h' - bailing out" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-# Check whether --with-pd-externs was given.
-if test "${with_pd_externs+set}" = set; then
- withval=$with_pd_externs; PD_EXTDIR="$withval"
-else
- PD_EXTDIR="${PD_DIR}/externs"
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## debugging
+ { echo "$as_me:$LINENO: checking whether to build a debug version" >&5
+echo $ECHO_N "checking whether to build a debug version... $ECHO_C" >&6; }
+ # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval=$enable_debug;
fi
+ if test "$enable_debug" = "yes" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ ENABLE_DEBUG="yes"
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ENABLE_DEBUG="no"
+ fi
+
+ ## debugging
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## warning flags, gcc
+ if test "$GCC" = "yes"; then
+ { echo "$as_me:$LINENO: checking whether to set default gcc warning flags" >&5
+echo $ECHO_N "checking whether to set default gcc warning flags... $ECHO_C" >&6; }
+ case "$UCFLAGS" in
+ *-W*)
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ PDEXT_WFLAGS="$WFLAGS -Wall -Winline -W -Wno-unused"
+ ;;
+ esac
+ fi
+ ## warning flags, gcc
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## compiled
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUILD_DATE "`date`"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUILD_USER "$USER"
+_ACEOF
+
+ ## /compiled
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN platform-dependent variables
+ ##
+
+ ##-- Defaults
+ LD=ld
+
+ ##----------- `uname -m`: machine hardware name
+ { echo "$as_me:$LINENO: checking target machine" >&5
+echo $ECHO_N "checking target machine... $ECHO_C" >&6; }
+ uname_m="`uname -m`"
+
+ ##-- alpha
+ if test "$uname_m" = alpha;
+ then
+ { echo "$as_me:$LINENO: result: alpha" >&5
+echo "${ECHO_T}alpha" >&6; }
+ PDEXT_AFLAGS="-mieee -mcpu=ev56";
+ else
+ { echo "$as_me:$LINENO: result: $uname_m" >&5
+echo "${ECHO_T}$uname_m" >&6; }
+ fi
+
+ ##----------- `uname -s`: kernel name
+ { echo "$as_me:$LINENO: checking target system" >&5
+echo $ECHO_N "checking target system... $ECHO_C" >&6; }
+ uname_s="`uname -s`"
+
+ case "$uname_s" in
+ Linux)
+ { echo "$as_me:$LINENO: result: linux" >&5
+echo "${ECHO_T}linux" >&6; }
+ ;;
+ Darwin)
+ { echo "$as_me:$LINENO: result: darwin" >&5
+echo "${ECHO_T}darwin" >&6; }
+ ;;
+ IRIX64)
+ { echo "$as_me:$LINENO: result: irix64" >&5
+echo "${ECHO_T}irix64" >&6; }
+ ;;
+ IRIX32)
+ { echo "$as_me:$LINENO: result: irix32" >&5
+echo "${ECHO_T}irix32" >&6; }
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: $uname_s" >&5
+echo "${ECHO_T}$uname_s" >&6; }
+ { echo "$as_me:$LINENO: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&5
+echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&2;}
+ uname_s="Linux"
+ ;;
+ esac
+
+ ##-- Linux
+ if test "$uname_s" = "Linux"
+ then
+ PDEXT_LFLAGS="-Wl,-export-dynamic -shared"
+ if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
+ ##-- only set OFLAGS if user CFLAGS are empty
+ PDEXT_OFLAGS="-O2 -pipe"
+ else
+ PDEXT_OFLAGS="-g"
+ fi
+ PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC"
+ PDEXT_DFLAGS="$PDEXT_DFLAGS -DPIC"
+ PDEXT=pd_linux
+ fi
+
+ ##-- MacOSX (darwin)
+ if test "$uname_s" = "Darwin"
+ then
+ LD=cc
+ PDEXT_LFLAGS="-bundle -undefined suppress -flat_namespace"
+ PDEXT_DFLAGS="-DMACOSX"
+ if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
+ ##-- only set OFLAGS if user CFLAGS are empty
+ PDEXT_OFLAGS="-O2"
+ else
+ PDEXT_OFLAGS="-g"
+ fi
+ PDEXT=pd_darwin
+ fi
+
+ ##-- irix64
+ if test "$uname_s" = "IRIX64"
+ then
+ PDEXT_LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
+ -shared -rdata_shared"
+ PDEXT=pd_irix6
+ fi
+
+ ##-- irix32
+ if test "$uname_s" = "IRIX32"
+ then
+ PDEXT_LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+ PDEXT=pd_irix5
+ fi
+
+ ##----------- report pd extension
+ { echo "$as_me:$LINENO: will use pd extension \".$PDEXT\" for pd externals" >&5
+echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
+
+ EXT=$PDEXT
+
+ ##----------- substitute
+
+
+
-# Check whether --with-pd-doc was given.
-if test "${with_pd_doc+set}" = set; then
- withval=$with_pd_doc; PD_DOCDIR="$withval"
-else
- PD_DOCDIR="${PD_DIR}/doc/5.reference"
-fi
+ ##-- add defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_FLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+ ## END platform-dependent variables
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+## /pd external common
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: flite
+
+##-- flite source directory
# Check whether --with-flite-dir was given.
if test "${with_flite_dir+set}" = set; then
@@ -3471,13 +3813,11 @@ if test "${with_flite_dir+set}" = set; then
fi
if test -n "$FLITE_DIR"; then
- IFLAGS="$IFLAGS -I${FLITE_DIR}/include"
- LFLAGS="$LFLAGS -L${FLITE_DIR}/lib"
+ CPPFLAGS="$CPPFLAGS -I${FLITE_DIR}/include"
+ LDFLAGS="$LDFLAGS -L${FLITE_DIR}/lib"
fi
##-- check: headers: flite.h
-CPPFLAGS="$UCPPFLAGS $IFLAGS"
-
{ echo "$as_me:$LINENO: checking for flite/flite.h" >&5
echo $ECHO_N "checking for flite/flite.h... $ECHO_C" >&6; }
if test "${ac_cv_header_flite_flite_h+set}" = set; then
@@ -3540,7 +3880,7 @@ echo "$as_me: error: Required header not found: aborting" >&2;}
fi
##-- check libs: libflite.a
-LDFLAGS="$ULDFLAGS $LFLAGS"
+LDFLAGS_SAVE="$LDFLAGS"
{ echo "$as_me:$LINENO: checking for flite_init in -lflite" >&5
echo $ECHO_N "checking for flite_init in -lflite... $ECHO_C" >&6; }
if test "${ac_cv_lib_flite_flite_init+set}" = set; then
@@ -3615,7 +3955,7 @@ if test "$pdflite_have_lib" != "yes"; then
/usr/flite/lib /usr/local/flite/lib /sw/flite/lib \
/usr/lib/flite/lib /usr/local/lib/flite/lib /sw/lib/flite/lib
do
- LDFLAGS="$ULDFLAGS $LFLAGS -L$d"
+ LDFLAGS="$LDFLAGS_SAVE -L$d"
{ echo "$as_me:$LINENO: checking for flite_init in -lflite" >&5
echo $ECHO_N "checking for flite_init in -lflite... $ECHO_C" >&6; }
if test "${ac_cv_lib_flite_flite_init+set}" = set; then
@@ -3684,7 +4024,6 @@ else
fi
if test "$pdflite_have_lib" = "yes"; then
- LFLAGS="$LFLAGS -L$d"
break
fi
done
@@ -3705,7 +4044,7 @@ fi
FLITE_LIBS="-lflite -lm"
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_cmulex
{ echo "$as_me:$LINENO: checking for cmu_lex_init in -lflite_cmulex" >&5
echo $ECHO_N "checking for cmu_lex_init in -lflite_cmulex... $ECHO_C" >&6; }
@@ -3784,7 +4123,7 @@ fi
FLITE_LEXLIBS="-lflite_cmulex"
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_usenglish
{ echo "$as_me:$LINENO: checking for usenglish_init in -lflite_usenglish" >&5
echo $ECHO_N "checking for usenglish_init in -lflite_usenglish... $ECHO_C" >&6; }
@@ -3863,7 +4202,7 @@ fi
FLITE_LANGLIBS="-lflite_usenglish"
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_cmu_us_kal16
{ echo "$as_me:$LINENO: checking for register_cmu_us_kal in -lflite_cmu_us_kal16" >&5
echo $ECHO_N "checking for register_cmu_us_kal in -lflite_cmu_us_kal16... $ECHO_C" >&6; }
@@ -3942,105 +4281,35 @@ fi
FLITE_VOICELIBS="-lflite_cmu_us_kal16"
+##-- register voice function
cat >>confdefs.h <<\_ACEOF
#define PDFLITE_REGISTER_VOICE register_cmu_us_kal
_ACEOF
+## /local: flite
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-{ echo "$as_me:$LINENO: checking whether we are building a debug version" >&5
-echo $ECHO_N "checking whether we are building a debug version... $ECHO_C" >&6; }
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
- enableval=$enable_debug;
-fi
-
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: debug
if test "$enable_debug" = "yes" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
DEBUG="yes"
DFLAGS="$DFLAGS -DPDFLITE_DEBUG"
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
DEBUG="no"
fi
-WFLAGS="-Wall"
-
-##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-## BEGIN machine-dependent variables
+## /local: debug
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-LD=ld
-
-##-- Linux
-if test `uname -s` = Linux;
-then
- LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
- if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
- ##-- only set OFLAGS if user CFLAGS are empty
- OFLAGS="-O2 -pipe"
- else
- OFLAGS="-g"
- fi
- OFLAGS="$OFLAGS -fPIC"
- DFLAGS="$DFLAGS -DPIC"
- PDEXT=pd_linux
-fi
-
-##-- MacOSX (darwin)
-if test `uname -s` = Darwin;
-then
- LD=cc
- LFLAGS="$LFLAGS -bundle -undefined suppress -flat_namespace"
- DFLAGS="$DFLAGS -DMACOSX"
- if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
- ##-- only set OFLAGS if user CFLAGS are empty
- OFLAGS="-O2"
- else
- OFLAGS="-g"
- fi
- PDEXT=pd_darwin
-fi
-
-##-- alpha
-if test `uname -m` = alpha;
-then
- AFLAGS="-mieee -mcpu=ev56";
- OFLAGS="$CFLAGS"
-fi
-
-##-- irix64
-if test `uname -s` = IRIX64;
-then
- LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
- -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
- -shared -rdata_shared"
- OFLAGS="$CFLAGS"
- PDEXT=pd_irix6
-fi
-
-##-- irix32
-if test `uname -s` = IRIX32;
-then
- LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
- OFLAGS="$CFLAGS"
- PDEXT=pd_irix5
-fi
-
-EXT=$PDEXT
-
-## END machine-dependent variables
-##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-CPPFLAGS="$UCPPFLAGS"
-CFLAGS="$UCFLAGS"
-LDFLAGS="$ULDFLAGS"
-LIBS="$ULIBS"
+##-- Restore user flags
+#CPPFLAGS="$UCPPFLAGS"
+#CFLAGS="$UCFLAGS"
+#LDFLAGS="$ULDFLAGS"
+#LIBS="$ULIBS"
ac_config_files="$ac_config_files config/Makefile Makefile"
@@ -4140,6 +4409,13 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -4154,10 +4430,10 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+if test -z "${WANT_OBJECT_EXTERNALS_TRUE}" && test -z "${WANT_OBJECT_EXTERNALS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+echo "$as_me: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4461,7 +4737,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pdflite $as_me 0.02, which was
+This file was extended by pdflite $as_me 0.02-1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4514,7 +4790,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pdflite config.status 0.02
+pdflite config.status 0.02-1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4751,6 +5027,9 @@ am__leading_dot!$am__leading_dot$ac_delim
AMTAR!$AMTAR$ac_delim
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -4767,22 +5046,67 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-AFLAGS!$AFLAGS$ac_delim
-DFLAGS!$DFLAGS$ac_delim
-IFLAGS!$IFLAGS$ac_delim
-LFLAGS!$LFLAGS$ac_delim
-OFLAGS!$OFLAGS$ac_delim
-WFLAGS!$WFLAGS$ac_delim
-LD!$LD$ac_delim
-EXT!$EXT$ac_delim
+LN_S!$LN_S$ac_delim
BUGREPORT!$BUGREPORT$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-PD_DIR!$PD_DIR$ac_delim
-PD_INC!$PD_INC$ac_delim
-PD_EXTDIR!$PD_EXTDIR$ac_delim
-PD_DOCDIR!$PD_DOCDIR$ac_delim
+pd_buildext!$pd_buildext$ac_delim
+pddir!$pddir$ac_delim
+pddocdir!$pddocdir$ac_delim
+pdincludedir!$pdincludedir$ac_delim
+pdextdir!$pdextdir$ac_delim
+pdexternsdir!$pdexternsdir$ac_delim
+pdexecdir!$pdexecdir$ac_delim
+WANT_OBJECT_EXTERNALS_TRUE!$WANT_OBJECT_EXTERNALS_TRUE$ac_delim
+WANT_OBJECT_EXTERNALS_FALSE!$WANT_OBJECT_EXTERNALS_FALSE$ac_delim
+ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim
+LD!$LD$ac_delim
+PDEXT!$PDEXT$ac_delim
+PDEXT_AFLAGS!$PDEXT_AFLAGS$ac_delim
+PDEXT_DFLAGS!$PDEXT_DFLAGS$ac_delim
+PDEXT_IFLAGS!$PDEXT_IFLAGS$ac_delim
+PDEXT_LFLAGS!$PDEXT_LFLAGS$ac_delim
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
FLITE_LIBS!$FLITE_LIBS$ac_delim
FLITE_LEXLIBS!$FLITE_LEXLIBS$ac_delim
FLITE_LANGLIBS!$FLITE_LANGLIBS$ac_delim
@@ -4792,7 +5116,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -4810,8 +5134,8 @@ if test -n "$ac_eof"; then
fi
cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -4824,6 +5148,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -5071,7 +5397,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
diff --git a/flite/configure.ac b/flite/configure.ac
index 73d7d76..4e6ddaf 100644
--- a/flite/configure.ac
+++ b/flite/configure.ac
@@ -4,59 +4,30 @@ AC_PREREQ(2.5)
dnl Some handy macros
define([THE_PACKAGE_NAME], [pdflite])
-define([THE_PACKAGE_VERSION], [0.02])
+define([THE_PACKAGE_VERSION], [0.02-1])
define([THE_PACKAGE_AUTHOR], [moocow@ling.uni-potsdam.de])
AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
-dnl
-dnl source & aux
-dnl
-AC_CONFIG_AUX_DIR(config)
-
-dnl
-dnl use automake
-dnl
-AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
-
-dnl
-dnl use autoheader
-dnl
-AM_CONFIG_HEADER(config.h)
+##-- Additional m4 macros
+AC_CONFIG_MACRO_DIR(m4)
-dnl
-dnl default prefix (== pd-dir)
-dnl
-AC_PREFIX_DEFAULT(/usr/local/lib/pd)
+##-- source & aux
+AC_CONFIG_AUX_DIR(config)
+dnl AC_CONFIG_AUX_DIR(.)
-##-- save user *FLAGS
+##-- save user's CFLAGS,CPPFLAGS
UCPPFLAGS="$CPPFLAGS"
UCFLAGS="$CFLAGS"
ULDFLAGS="$LDFLAGS"
ULIBS="$LIBS"
-dnl
-dnl Programs
-dnl
-AC_PROG_CC
-AC_PROG_INSTALL
-
-dnl
-dnl Substitutions
-dnl
-AC_SUBST(AFLAGS)
-AC_SUBST(DFLAGS)
-AC_SUBST(IFLAGS)
-AC_SUBST(LFLAGS)
-AC_SUBST(OFLAGS)
-AC_SUBST(WFLAGS)
-AC_SUBST(LD)
-AC_SUBST(EXT)
+##-- use automake, autoheader
+AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
+AM_CONFIG_HEADER(config.h)
-dnl version stuff (automatically exported?)
-AC_SUBST(PACKAGE_VERSION)
-AC_SUBST(PACKAGE_NAME)
-AC_SUBST(BUGREPORT)
+##-- Default prefix
+AC_PREFIX_DEFAULT(/usr/local)
dnl ----- maintainer mode
dnl + enables "maintainer mode" only with ./configure --enable-maintainer-mode
@@ -68,59 +39,26 @@ dnl SVN sources consistent
AM_MAINTAINER_MODE
dnl -----/maintainer mode
-##-- banner stuff
-compiled_by="${LOGNAME:-${USER:-(unknown)}}"
-compiled_on="`date`"
-test -z "$compiled_on" && compiled_on="?"
-
-AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_BY, "$compiled_by", [User who compiled this external])
-AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_ON, "$compiled_on", [When this external was compiled])
-
-dnl
-dnl pd-directory/ies
-dnl
-AC_ARG_WITH(pd-dir,
- AC_HELP_STRING([--with-pd-dir=DIR], [PD base directory (default=/usr/local/pd)]),
- [PD_DIR="$withval"],
- [PD_DIR="/usr/local/pd"])
-AC_SUBST(PD_DIR)
-
-AC_ARG_WITH(pd-include,
- AC_HELP_STRING([--with-pd-include=DIR], [PD include directory (default=${PD_DIR}/src)]),
- [PD_INC="$withval"],
- [PD_INC="${PD_DIR}/src"])
-IFLAGS="$IFLAGS -I${PD_INC}"
-AC_SUBST(PD_INC)
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Pd external checks
+AX_PD_EXTERNAL
+## /pd external common
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-AC_ARG_WITH(pd-externs,
- AC_HELP_STRING([--with-pd-externs=DIR], [PD externals directory (default=${PD_DIR}/externs)]),
- [PD_EXTDIR="$withval"],
- [PD_EXTDIR="${PD_DIR}/externs"])
-AC_SUBST(PD_EXTDIR)
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: flite
-
-AC_ARG_WITH(pd-doc,
- AC_HELP_STRING([--with-pd-doc=DIR],
- [PD documentation directory (default=${PD_DIR}/doc/5.reference)]),
- [PD_DOCDIR="$withval"],
- [PD_DOCDIR="${PD_DIR}/doc/5.reference"])
-AC_SUBST(PD_DOCDIR)
-
-
-dnl
-dnl flite source directory
-dnl
+##-- flite source directory
AC_ARG_WITH(flite-dir,
AC_HELP_STRING([--with-flite-dir=DIR], [Flite source directory (default=none)]),
[FLITE_DIR="$withval"],
)
if test -n "$FLITE_DIR"; then
- IFLAGS="$IFLAGS -I${FLITE_DIR}/include"
- LFLAGS="$LFLAGS -L${FLITE_DIR}/lib"
+ CPPFLAGS="$CPPFLAGS -I${FLITE_DIR}/include"
+ LDFLAGS="$LDFLAGS -L${FLITE_DIR}/lib"
fi
##-- check: headers: flite.h
-CPPFLAGS="$UCPPFLAGS $IFLAGS"
AC_CHECK_HEADER([flite/flite.h],[pdflite_have_header=yes],[pdflite_have_header=no],[ ])
if test "$pdflite_have_header" != "yes"; then
AC_MSG_WARN([Required header 'flite.h' not found])
@@ -129,7 +67,7 @@ if test "$pdflite_have_header" != "yes"; then
fi
##-- check libs: libflite.a
-LDFLAGS="$ULDFLAGS $LFLAGS"
+LDFLAGS_SAVE="$LDFLAGS"
AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm])
if test "$pdflite_have_lib" != "yes"; then
for d in \
@@ -138,10 +76,9 @@ if test "$pdflite_have_lib" != "yes"; then
/usr/flite/lib /usr/local/flite/lib /sw/flite/lib \
/usr/lib/flite/lib /usr/local/lib/flite/lib /sw/lib/flite/lib
do
- LDFLAGS="$ULDFLAGS $LFLAGS -L$d"
+ LDFLAGS="$LDFLAGS_SAVE -L$d"
AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm])
if test "$pdflite_have_lib" = "yes"; then
- LFLAGS="$LFLAGS -L$d"
break
fi
done
@@ -158,133 +95,52 @@ fi
FLITE_LIBS="-lflite -lm"
AC_SUBST(FLITE_LIBS)
-dnl
-dnl Check for flite : libs : flite_cmulex
-dnl
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_cmulex
AC_CHECK_LIB(flite_cmulex,[cmu_lex_init],[],
[AC_MSG_ERROR([required library 'flite_cmulex' not found -- quitting],1)],
[-lflite -lm])
FLITE_LEXLIBS="-lflite_cmulex"
AC_SUBST(FLITE_LEXLIBS)
-dnl
-dnl Check for flite : libs : flite_usenglish
-dnl
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_usenglish
AC_CHECK_LIB(flite_usenglish,[usenglish_init],[],
[AC_MSG_ERROR([required library 'flite_usenglish' not found -- quitting],1)],
[-lflite_cmulex -lflite -lm])
FLITE_LANGLIBS="-lflite_usenglish"
AC_SUBST(FLITE_LANGLIBS)
-dnl Check for flite : libs : flite_cmu_us_kal16
-dnl
-LDFLAGS="$ULDFLAGS $LFLAGS"
+##-- Check for flite : libs : flite_cmu_us_kal16
AC_CHECK_LIB(flite_cmu_us_kal16,[register_cmu_us_kal],[],
[AC_MSG_ERROR([required library 'flite_cmu_us_kal16' not found -- quitting],1)],
[-lflite_usenglish -lflite_cmulex -lflite -lm])
FLITE_VOICELIBS="-lflite_cmu_us_kal16"
AC_SUBST(FLITE_VOICELIBS)
+##-- register voice function
AC_DEFINE([PDFLITE_REGISTER_VOICE],[register_cmu_us_kal],
[This is the function we will call to register the synth voice])
+## /local: flite
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-dnl
-dnl debug version?
-dnl
-AC_MSG_CHECKING([whether we are building a debug version])
-AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug],[build debug version (default=no)]))
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: debug
if test "$enable_debug" = "yes" ; then
- AC_MSG_RESULT(yes)
DEBUG="yes"
DFLAGS="$DFLAGS -DPDFLITE_DEBUG"
else
- AC_MSG_RESULT(no)
DEBUG="no"
fi
AC_SUBST(DEBUG)
-dnl
-dnl compiler warnings
-dnl
-WFLAGS="-Wall"
-
-##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-## BEGIN machine-dependent variables
-
-LD=ld
-
-##-- Linux
-if test `uname -s` = Linux;
-then
- LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
- if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
- ##-- only set OFLAGS if user CFLAGS are empty
- OFLAGS="-O2 -pipe"
- else
- OFLAGS="-g"
- fi
- OFLAGS="$OFLAGS -fPIC"
- DFLAGS="$DFLAGS -DPIC"
- PDEXT=pd_linux
-fi
-
-##-- MacOSX (darwin)
-if test `uname -s` = Darwin;
-then
- LD=cc
- LFLAGS="$LFLAGS -bundle -undefined suppress -flat_namespace"
- DFLAGS="$DFLAGS -DMACOSX"
- if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
- ##-- only set OFLAGS if user CFLAGS are empty
- OFLAGS="-O2"
- else
- OFLAGS="-g"
- fi
- PDEXT=pd_darwin
-fi
-
-##-- alpha
-if test `uname -m` = alpha;
-then
- AFLAGS="-mieee -mcpu=ev56";
- OFLAGS="$CFLAGS"
-fi
-
-##-- irix64
-if test `uname -s` = IRIX64;
-then
- LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
- -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
- -shared -rdata_shared"
- OFLAGS="$CFLAGS"
- PDEXT=pd_irix6
-fi
-
-##-- irix32
-if test `uname -s` = IRIX32;
-then
- LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
- OFLAGS="$CFLAGS"
- PDEXT=pd_irix5
-fi
-
-EXT=$PDEXT
-
-## END machine-dependent variables
-##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+## /local: debug
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-dnl
-dnl Restore user flags
-dnl
-CPPFLAGS="$UCPPFLAGS"
-CFLAGS="$UCFLAGS"
-LDFLAGS="$ULDFLAGS"
-LIBS="$ULIBS"
+##-- Restore user flags
+#CPPFLAGS="$UCPPFLAGS"
+#CFLAGS="$UCFLAGS"
+#LDFLAGS="$ULDFLAGS"
+#LIBS="$ULIBS"
AC_OUTPUT(config/Makefile Makefile)
diff --git a/flite/flite.c b/flite/flite.c
index bcd8a39..3ed798b 100644
--- a/flite/flite.c
+++ b/flite/flite.c
@@ -48,7 +48,7 @@ static cst_voice *voice;
static const char *flite_description =
"flite: Text-to-Speech external v" PACKAGE_VERSION " by Bryan Jurish\n"
- "flite: compiled on " PDFLITE_COMPILED_ON " by " PDFLITE_COMPILED_BY "\n"
+ "flite: compiled on " PACKAGE_BUILD_DATE " by " PACKAGE_BUILD_USER "\n"
;
//static char *flite_acknowledge = "flite: based on code by ";
//static char *flite_version = "flite: PD external v%s by Bryan Jurish";
diff --git a/flite/m4 b/flite/m4
new file mode 120000
index 0000000..83ffc0c
--- /dev/null
+++ b/flite/m4
@@ -0,0 +1 @@
+../common/m4 \ No newline at end of file
diff --git a/flite/pdexternal.am b/flite/pdexternal.am
new file mode 120000
index 0000000..914f4be
--- /dev/null
+++ b/flite/pdexternal.am
@@ -0,0 +1 @@
+../common/pdexternal.am \ No newline at end of file
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 18:36:48 +0000