diff options
Diffstat (limited to 'locale')
-rw-r--r-- | locale/Makefile.am | 81 | ||||
-rw-r--r-- | locale/Makefile.in | 139 | ||||
-rw-r--r-- | locale/aclocal.m4 | 1 | ||||
-rw-r--r-- | locale/config/Makefile.am | 63 | ||||
-rw-r--r-- | locale/config/Makefile.in | 113 | ||||
-rwxr-xr-x | locale/configure | 931 | ||||
-rw-r--r-- | locale/configure.ac | 218 | ||||
l--------- | locale/m4 | 1 | ||||
l--------- | locale/pdexternal.am | 1 | ||||
-rw-r--r-- | locale/src/Makefile.am | 112 | ||||
-rw-r--r-- | locale/src/Makefile.in | 331 | ||||
-rw-r--r-- | locale/src/config.h.in | 21 | ||||
-rw-r--r-- | locale/src/locale-help.pd | 4 | ||||
-rw-r--r-- | locale/src/locale.c | 13 | ||||
-rw-r--r-- | locale/src/uselocale.c | 48 |
15 files changed, 970 insertions, 1107 deletions
diff --git a/locale/Makefile.am b/locale/Makefile.am index 5e5d148..78455e1 100644 --- a/locale/Makefile.am +++ b/locale/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,82 +25,9 @@ AUTOMAKE_OPTIONS = foreign ## --- recursion subdirectories SUBDIRS = config src -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .pod .txt - -#----------------------------------------------------------------------- -# 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) autogen.sh configure \ - README.cvs COPYING - -## --- 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 ; - diff --git a/locale/Makefile.in b/locale/Makefile.in index c420a34..57233b0 100644 --- a/locale/Makefile.in +++ b/locale/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@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -45,11 +46,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + $(top_srcdir)/pdexternal.am COPYING +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 \ @@ -80,7 +83,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@ @@ -94,31 +96,28 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ 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@ -IFLAGS = @IFLAGS@ +ENABLE_DEBUG = @ENABLE_DEBUG@ +EXEEXT = .@PDEXT@ 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@ @@ -127,12 +126,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ +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@ @@ -160,8 +165,11 @@ 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@ @@ -172,18 +180,28 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip -AUTOMAKE_OPTIONS = foreign -SUBDIRS = config src -SUFFIXES = .pod .txt - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -#MOSTLYCLEANFILES = - -#CLEANFILES = +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 \ @@ -191,37 +209,48 @@ 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) - -#CVSCLEANFILES = Makefile.in Makefile - #----------------------------------------------------------------------- -# Additional Variables & Rules: PODS +# Includes #----------------------------------------------------------------------- -PODS = README.pod #----------------------------------------------------------------------- -# Variables: distribution +# Options & Subdirectories #----------------------------------------------------------------------- -EXTRA_DIST = \ - $(PODS:.pod=.txt) autogen.sh configure \ - README.cvs COPYING +ACLOCAL_AMFLAGS = -I m4 + +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +AUTOMAKE_OPTIONS = foreign +SUBDIRS = config src +#----------------------------------------------------------------------- +# Additional Variables & Rules: PODS +#----------------------------------------------------------------------- +PODS = README.pod all: all-recursive .SUFFIXES: -.SUFFIXES: .pod .txt +.SUFFIXES: .@PDEXT@ .pod .txt .html 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*) \ @@ -389,6 +418,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 \ @@ -549,6 +579,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) @@ -626,34 +657,20 @@ uninstall-info: uninstall-info-recursive uninstall uninstall-am uninstall-info-am -maintainer-clean-local: - rm -rf autom4te.cache - .pod.txt: pod2text $< $@ -all-local: $(PODS:.pod=.txt) - -#DIST_SUBDIRS = $(SUBDIRS) +.pod.html: + pod2html $< --outfile=$@ -#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 ; +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/locale/aclocal.m4 b/locale/aclocal.m4 index b7a0e85..4ab8160 100644 --- a/locale/aclocal.m4 +++ b/locale/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/locale/config/Makefile.am b/locale/config/Makefile.am index 847c2ae..cfe9dde 100644 --- a/locale/config/Makefile.am +++ b/locale/config/Makefile.am @@ -1,66 +1,7 @@ ## File: config/Makefile.am -## Package: readdir +## Package: (pd external) ## Description: ## + automake file for 'config' package-subdir -## -## 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 - -# config.guess -# config.sub -# ltmain.sh -# texinfo.tex - -## --- recursion subdirectories for 'make dist' -#DIST_SUBDIRS = $(SUBDIRS) - -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; +include $(top_srcdir)/pdexternal.am diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in index a05e281..6e134f2 100644 --- a/locale/config/Makefile.in +++ b/locale/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@ @@ -67,31 +66,28 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ 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@ -IFLAGS = @IFLAGS@ +ENABLE_DEBUG = @ENABLE_DEBUG@ +EXEEXT = .@PDEXT@ 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@ @@ -100,12 +96,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ +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@ @@ -133,8 +135,11 @@ 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@ @@ -145,9 +150,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 \ @@ -155,20 +192,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*) \ @@ -206,6 +238,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 \ @@ -253,9 +286,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" @@ -291,7 +326,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 @@ -312,21 +348,20 @@ 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 + +.pod.txt: + pod2text $< $@ -# config.guess -# config.sub -# ltmain.sh -# texinfo.tex +.pod.html: + pod2html $< --outfile=$@ -#DIST_SUBDIRS = $(SUBDIRS) +maintainer-clean-local: + rm -rf autom4te.cache -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- .PHONY: cvsclean cvsclean-hook cvsclean: maintainer-clean ; diff --git a/locale/configure b/locale/configure index bef3895..7a2b32e 100755 --- a/locale/configure +++ b/locale/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for locale 0.01. +# Generated by GNU Autoconf 2.61 for locale 0.02. # # Report bugs to <moocow@ling.uni-potsdam.de>. # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='locale' PACKAGE_TARNAME='locale' -PACKAGE_VERSION='0.01' -PACKAGE_STRING='locale 0.01' +PACKAGE_VERSION='0.02' +PACKAGE_STRING='locale 0.02' PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de' ac_default_prefix=/usr/local @@ -637,6 +637,9 @@ am__leading_dot AMTAR am__tar am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT CC CFLAGS LDFLAGS @@ -653,24 +656,26 @@ AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE -AFLAGS -DFLAGS -IFLAGS -LFLAGS -OFLAGS -WFLAGS -LD -PDEXT +LN_S BUGREPORT -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -PD_OBJECT_EXTERNALS +pd_buildext pddir pddocdir pdincludedir +pdextdir pdexternsdir -DEBUG +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 LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1184,7 +1189,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 locale 0.01 to adapt to many kinds of systems. +\`configure' configures locale 0.02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1250,25 +1255,28 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of locale 0.01:";; + short | recursive ) echo "Configuration of locale 0.02:";; 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=PREFIX/pd) - --with-pd-include=DIR PD include directory (default=NONE) - --with-pd-extdir=DIR Directory for PD externals (default=PDDIR/externs) + --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) Some influential environment variables: CC C compiler command @@ -1343,7 +1351,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -locale configure 0.01 +locale configure 0.02 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1357,7 +1365,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 locale $as_me 0.01, which was +It was created by locale $as_me 0.02, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1711,6 +1719,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 @@ -1743,9 +1755,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +##-- save user's CFLAGS,CPPFLAGS UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" +ULDFLAGS="$LDFLAGS" +##-- 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 @@ -2032,7 +2047,7 @@ fi # Define the identity of the package. PACKAGE=locale - VERSION=0.01 + VERSION=0.02 cat >>confdefs.h <<_ACEOF @@ -2178,12 +2193,119 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers src/config.h" +##-- Default prefix -ac_ext=c + +{ 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 + + { 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 + + + +##-- other flags (?) + +##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' @@ -3101,71 +3223,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= @@ -3276,7 +3333,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 @@ -3356,50 +3413,392 @@ 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 + pddocdir="${pddir}/doc/5.reference" -{ 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 + ##-- 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" + + + ## pd-directory/ies + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ##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 + + + { 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 + + +if test "$want_object_externals" != "no"; then + WANT_OBJECT_EXTERNALS_TRUE= + WANT_OBJECT_EXTERNALS_FALSE='#' +else + 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 */ + +#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 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_m_pd_h=no +fi + +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 + + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ##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" + elif test "$ENABLE_DEBUG" = "yes"; then + 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" + elif test "$ENABLE_DEBUG" = "yes"; then + 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 + + + + + + + + + + ##-- add defaults to user flags + CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + + ## END platform-dependent variables + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +## /pd external common +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers @@ -4352,228 +4751,27 @@ fi -{ 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${am__api_version}: on install" >&5 -echo "${ECHO_T}automake v${am__api_version}: on install" >&6; } - 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; } - buildext="\$(EXEEXT)" - ;; -esac - -PD_OBJECT_EXTERNALS="locale${buildext}" - - - - -# 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 - -pddocdir="${pddir}/doc/5.reference" - - - - - - -# Check whether --with-pd-include was given. -if test "${with_pd_include+set}" = set; then - withval=$with_pd_include; pdincludedir="$withval" -else - pdincludedir="" -fi - -if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" -fi - - - -# Check whether --with-pd-extdir was given. -if test "${with_pd_extdir+set}" = set; then - withval=$with_pd_extdir; pdexternsdir="$withval" -else - pdexternsdir="$pddir/externs" -fi - - - -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 */ - -#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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_m_pd_h=no -fi - -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: WARNING: -----------------------------------------------------------------" >&5 -echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} - { echo "$as_me:$LINENO: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&5 -echo "$as_me: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&2;} - { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5 -echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} -fi - - +## /local: headers +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -{ 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 -if test "$enable_debug" = "yes" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - DEBUG="yes" +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: debug +if test "$enable_debug" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define RAWFILE_DEBUG 1 +#define LOCALE_DEBUG 1 _ACEOF -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - DEBUG="no" fi - - - -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## compiled - -cat >>confdefs.h <<_ACEOF -#define PDMOOEXT_DATE "`date`" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PDMOOEXT_USER "$USER" -_ACEOF - -## /compiled +## /local: debug ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -##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 -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -CFLAGS="$UCFLAGS" -CPPFLAGS="$UCPPFLAGS" +##-- restore user's CFLAGS +#CFLAGS="$UCFLAGS" +#CPPFLAGS="$UCPPFLAGS" ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile" @@ -4673,6 +4871,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 @@ -4687,10 +4892,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 @@ -4994,7 +5199,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 locale $as_me 0.01, which was +This file was extended by locale $as_me 0.02, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5047,7 +5252,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -locale config.status 0.01 +locale config.status 0.02 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -5285,6 +5490,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 @@ -5301,29 +5509,72 @@ 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 -PDEXT!$PDEXT$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_OBJECT_EXTERNALS!$PD_OBJECT_EXTERNALS$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 -DEBUG!$DEBUG$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 LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -5341,7 +5592,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -5604,7 +5855,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" >$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/locale/configure.ac b/locale/configure.ac index 053f116..1cf1beb 100644 --- a/locale/configure.ac +++ b/locale/configure.ac @@ -4,59 +4,30 @@ AC_PREREQ(2.5) dnl Some handy macros define([THE_PACKAGE_NAME], [locale]) -define([THE_PACKAGE_VERSION], [0.01]) +define([THE_PACKAGE_VERSION], [0.02]) 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 +##-- Additional m4 macros +AC_CONFIG_MACRO_DIR(m4) + +##-- source & aux AC_CONFIG_AUX_DIR(config) +dnl AC_CONFIG_AUX_DIR(.) -dnl -dnl save user's CFLAGS,CPPFLAGS -dnl +##-- save user's CFLAGS,CPPFLAGS UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" +ULDFLAGS="$LDFLAGS" -dnl -dnl use automake -dnl +##-- use automake, autoheader AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION) - -dnl -dnl use autoheader -dnl AM_CONFIG_HEADER(src/config.h) - -dnl -dnl Programs, prefix -dnl -AC_PROG_CC -AC_PROG_INSTALL +##-- Default prefix AC_PREFIX_DEFAULT(/usr/local) -dnl -dnl Substitutions -dnl -AC_SUBST(DEFS) -AC_SUBST(AFLAGS) -AC_SUBST(DFLAGS) -AC_SUBST(IFLAGS) -AC_SUBST(LFLAGS) -AC_SUBST(OFLAGS) -AC_SUBST(WFLAGS) -AC_SUBST(LD) - -AC_SUBST(PDEXT) - -dnl version stuff (automatically exported?) -AC_SUBST(PACKAGE_VERSION) -AC_SUBST(PACKAGE_NAME) -AC_SUBST(BUGREPORT) - dnl ----- maintainer mode dnl + enables "maintainer mode" only with ./configure --enable-maintainer-mode dnl - causes make __never__ to invoke 'config/missing', e.g. any autotools @@ -67,11 +38,18 @@ dnl SVN sources consistent AM_MAINTAINER_MODE dnl -----/maintainer mode - -dnl other flags +##-- other flags (?) dnl AC_ISC_POSIX -dnl Checks for header files. +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Pd external checks +AX_PD_EXTERNAL +## /pd external common +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers + dnl AC_HEADER_STDC AC_CHECK_HEADERS([string.h wchar.h locale.h], [], @@ -90,157 +68,23 @@ AC_CHECK_DECLS([LC_COLLATE,LC_CTYPE,LC_MONETARY,LC_NUMERIC,LC_TIME],[],[],[#incl ##-- check for additional LC_* declarations AC_CHECK_DECLS([LC_MESSAGES,LC_PAPER,LC_NAME,LC_ADDRESS,LC_TELEPHONE,LC_MEASUREMENT,LC_IDENTIFICATION],[],[],[#include <locale.h>]) -dnl PD externals -AC_MSG_CHECKING([how to hack automake EXEEXT conventions]) -case "${am__api_version}" in - 1.[[0-4]]*) - AC_MSG_RESULT([automake v${am__api_version}: on install]) - buildext="" - ;; - *) - AC_MSG_RESULT([automake v${am__api_version}: on build]) - buildext="\$(EXEEXT)" - ;; -esac - -PD_OBJECT_EXTERNALS="locale${buildext}" -AC_SUBST(PD_OBJECT_EXTERNALS) - - -dnl -dnl pd-directory/ies -dnl -AC_ARG_WITH(pd-dir, - AC_HELP_STRING([--with-pd-dir=DIR], [PD base directory (default=PREFIX/pd)]), - [pddir="$withval"], - [pddir="\${prefix}/pd"]) -pddocdir="${pddir}/doc/5.reference" -AC_SUBST(pddir) -AC_SUBST(pddocdir) - - - -AC_ARG_WITH(pd-include, - AC_HELP_STRING([--with-pd-include=DIR], [PD include directory (default=NONE)]), - [pdincludedir="$withval"], - [pdincludedir=""]) -if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" -fi -AC_SUBST(pdincludedir) - -AC_ARG_WITH(pd-extdir, - AC_HELP_STRING([--with-pd-extdir=DIR], [Directory for PD externals (default=PDDIR/externs)]), - [pdexternsdir="$withval"], - [pdexternsdir="$pddir/externs"]) -AC_SUBST(pdexternsdir) - -dnl -dnl Check for m_pd.h -dnl -CPPFLAGS="$CPPFLAGS $IFLAGS" -AC_CHECK_HEADER(m_pd.h,[], - AC_MSG_WARN([-----------------------------------------------------------------]) - AC_MSG_WARN([could not find PD header file 'm_pd.h' -- things might get ugly.]) - AC_MSG_WARN([-----------------------------------------------------------------]), - [/* nonempty includes: compile only */]) - - -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)])) -if test "$enable_debug" = "yes" ; then - AC_MSG_RESULT(yes) - DEBUG="yes" - AC_DEFINE(RAWFILE_DEBUG,1, - [Define this to include debugging code for the 'rawfile' external.]) -else - AC_MSG_RESULT(no) - DEBUG="no" -fi -AC_SUBST(DEBUG) - - -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## compiled -AC_DEFINE_UNQUOTED(PDMOOEXT_DATE, "`date`", [Date this external was configured]) -AC_DEFINE_UNQUOTED(PDMOOEXT_USER, "$USER", [User who configured this external]) -## /compiled +## /local: headers ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -##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 +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: debug +if test "$enable_debug" = "yes"; then + AC_DEFINE(LOCALE_DEBUG,1, + [Define this to include debugging code for the 'locale' external.]) fi +## /local: debug +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -EXT=$PDEXT - -## END machine-dependent variables -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -dnl -dnl restore user's CFLAGS -dnl -CFLAGS="$UCFLAGS" -CPPFLAGS="$UCPPFLAGS" +##-- restore user's CFLAGS +#CFLAGS="$UCFLAGS" +#CPPFLAGS="$UCPPFLAGS" AC_OUTPUT(config/Makefile src/Makefile Makefile) diff --git a/locale/m4 b/locale/m4 new file mode 120000 index 0000000..83ffc0c --- /dev/null +++ b/locale/m4 @@ -0,0 +1 @@ +../common/m4
\ No newline at end of file diff --git a/locale/pdexternal.am b/locale/pdexternal.am new file mode 120000 index 0000000..914f4be --- /dev/null +++ b/locale/pdexternal.am @@ -0,0 +1 @@ +../common/pdexternal.am
\ No newline at end of file diff --git a/locale/src/Makefile.am b/locale/src/Makefile.am index 8eb938e..3c5829e 100644 --- a/locale/src/Makefile.am +++ b/locale/src/Makefile.am @@ -1,37 +1,24 @@ # File: ./src/Makefile.am -# Package: rawfile +# Package: (pd external) # Description: # + src-level automake file -# -# Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- #----------------------------------------------------------------------- -# Options & Subdirectories +# Includes #----------------------------------------------------------------------- - -## --- recursion subdirectories -#SUBDIRS = - -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .@PDEXT@ - -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- -PDEXT = @PDEXT@ -EXEEXT = .@PDEXT@ +include $(top_srcdir)/pdexternal.am #----------------------------------------------------------------------- # pd externals (hacked _PROGRAMS target) #----------------------------------------------------------------------- ## --- externals -pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@ +pdexterns_PROGRAMS = locale uselocale ## --- possible externals EXTRA_PROGRAMS = \ - locale + locale uselocale ## --- patches pdexterns_DATA = @@ -43,90 +30,5 @@ pddoc_DATA = locale-help.pd #----------------------------------------------------------------------- # sources #----------------------------------------------------------------------- - -locale_SOURCES = \ - locale.c - -#----------------------------------------------------------------------- -# external compilation : flags -#----------------------------------------------------------------------- -DEFS = @DEFS@ -AFLAGS = @AFLAGS@ -DFLAGS = @DFLAGS@ -IFLAGS = @IFLAGS@ -LFLAGS = @LFLAGS@ -OFLAGS = @OFLAGS@ -WFLAGS = -Wall -Winline - -AM_CPPFLAGS = $(IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) - -locale_LDFLAGS = $(LFLAGS) -#locale_LDADD = - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -## --- mostlyclean: built by 'make' & commonly rebuilt -#MOSTLYCLEANFILES = - -## --- clean: built by 'make' -CLEANFILES = *.$(PDEXT) - -## --- 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 - - -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- - -## --- extra distribution files -EXTRA_DIST = \ - $(pddoc_DATA) \ - $(pdexterns_DATA) - -## --- 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 ; - +locale_SOURCES = locale.c +uselocale_SOURCES = uselocale.c diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in index f2dec40..ed878f8 100644 --- a/locale/src/Makefile.in +++ b/locale/src/Makefile.in @@ -15,18 +15,15 @@ @SET_MAKE@ # File: ./src/Makefile.am -# Package: rawfile +# Package: (pd external) # Description: # + src-level automake file -# -# Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- -#----------------------------------------------------------------------- -# Options & Subdirectories -#----------------------------------------------------------------------- +#ACLOCAL_AMFLAGS = -I m4 -#SUBDIRS = +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +#AUTOMAKE_OPTIONS = foreign srcdir = @srcdir@ @@ -49,14 +46,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@ -EXTRA_PROGRAMS = locale$(EXEEXT) -subdir = src -SUBDIRS = DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in + $(srcdir)/config.h.in $(top_srcdir)/pdexternal.am +pdexterns_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT) +EXTRA_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT) +subdir = src 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 @@ -69,6 +66,9 @@ PROGRAMS = $(pdexterns_PROGRAMS) am_locale_OBJECTS = locale.$(OBJEXT) locale_OBJECTS = $(am_locale_OBJECTS) locale_LDADD = $(LDADD) +am_uselocale_OBJECTS = uselocale.$(OBJEXT) +uselocale_OBJECTS = $(am_uselocale_OBJECTS) +uselocale_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -76,14 +76,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(locale_SOURCES) -DIST_SOURCES = $(locale_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive +SOURCES = $(locale_SOURCES) $(uselocale_SOURCES) +DIST_SOURCES = $(locale_SOURCES) $(uselocale_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -97,7 +91,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AFLAGS = @AFLAGS@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ @@ -111,35 +104,28 @@ CCDEPMODE = @CCDEPMODE@ 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@ +ENABLE_DEBUG = @ENABLE_DEBUG@ EXEEXT = .@PDEXT@ -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@ @@ -147,17 +133,19 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ - -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ +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 = -Wall -Winline +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@ @@ -185,8 +173,11 @@ 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@ @@ -197,25 +188,27 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUFFIXES = .@PDEXT@ -pdexterns_DATA = -pddoc_DATA = locale-help.pd - -#----------------------------------------------------------------------- -# sources -#----------------------------------------------------------------------- -locale_SOURCES = \ - locale.c - -AM_CPPFLAGS = $(IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) -locale_LDFLAGS = $(LFLAGS) -#locale_LDADD = - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -#MOSTLYCLEANFILES = +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 \ @@ -224,32 +217,37 @@ 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 - - -#CVSCLEAN_SUBDIRS = $(SUBDIRS) + texinfo.tex \ + ylwrap -#CVSCLEANFILES = Makefile.in Makefile +pdexterns_DATA = +pddoc_DATA = locale-help.pd #----------------------------------------------------------------------- -# Variables: distribution +# sources #----------------------------------------------------------------------- -EXTRA_DIST = \ - $(pddoc_DATA) \ - $(pdexterns_DATA) - -DIST_SUBDIRS = $(SUBDIRS) +locale_SOURCES = locale.c +uselocale_SOURCES = uselocale.c all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .@PDEXT@ .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +.SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj +$(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*) \ @@ -321,6 +319,9 @@ clean-pdexternsPROGRAMS: locale$(EXEEXT): $(locale_OBJECTS) $(locale_DEPENDENCIES) @rm -f locale$(EXEEXT) $(LINK) $(locale_LDFLAGS) $(locale_OBJECTS) $(locale_LDADD) $(LIBS) +uselocale$(EXEEXT): $(uselocale_OBJECTS) $(uselocale_DEPENDENCIES) + @rm -f uselocale$(EXEEXT) + $(LINK) $(uselocale_LDFLAGS) $(uselocale_OBJECTS) $(uselocale_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -329,6 +330,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locale.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uselocale.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -379,77 +381,6 @@ uninstall-pdexternsDATA: rm -f "$(DESTDIR)$(pdexternsdir)/$$f"; \ done -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -460,23 +391,10 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -489,7 +407,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -512,6 +430,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 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 \ @@ -538,38 +457,22 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done check-am: all-am -check: check-recursive +check: check-am all-am: Makefile $(PROGRAMS) $(DATA) config.h -installdirs: installdirs-recursive -installdirs-am: +installdirs: for dir in "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" "$(DESTDIR)$(pdexternsdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-recursive +installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -588,23 +491,23 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-recursive +clean: clean-am clean-am: clean-generic clean-pdexternsPROGRAMS mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am -info: info-recursive +info: info-am info-am: @@ -613,71 +516,57 @@ install-data-am: install-pddocDATA install-pdexternsDATA \ install-exec-am: -install-info: install-info-recursive +install-info: install-info-am install-man: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic \ maintainer-clean-local -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: uninstall-am: uninstall-info-am uninstall-pddocDATA \ uninstall-pdexternsDATA uninstall-pdexternsPROGRAMS -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-pdexternsPROGRAMS clean-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-hdr distclean-recursive \ - distclean-tags distdir 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-pdexternsDATA \ - install-pdexternsPROGRAMS 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 \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-pdexternsPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-hdr distclean-tags distdir 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-pdexternsDATA install-pdexternsPROGRAMS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ uninstall-pddocDATA uninstall-pdexternsDATA \ uninstall-pdexternsPROGRAMS -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 ; diff --git a/locale/src/config.h.in b/locale/src/config.h.in index 40f0f0d..dbf3680 100644 --- a/locale/src/config.h.in +++ b/locale/src/config.h.in @@ -61,12 +61,21 @@ /* Define to 1 if you have the <wchar.h> header file. */ #undef HAVE_WCHAR_H +/* Define this to include debugging code for the 'locale' external. */ +#undef LOCALE_DEBUG + /* Name of package */ #undef PACKAGE /* 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 @@ -79,14 +88,8 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Date this external was configured */ -#undef PDMOOEXT_DATE - -/* User who configured this external */ -#undef PDMOOEXT_USER - -/* Define this to include debugging code for the 'rawfile' external. */ -#undef RAWFILE_DEBUG - /* Version number of package */ #undef VERSION + +/* Define this if you are building single-object externals */ +#undef WANT_OBJECT_EXTERNALS diff --git a/locale/src/locale-help.pd b/locale/src/locale-help.pd index 20da938..b408d3f 100644 --- a/locale/src/locale-help.pd +++ b/locale/src/locale-help.pd @@ -19,10 +19,10 @@ results. In particular \, setting LC_NUMERIC (possibly via LC_ALL or LANG) to a locale whose floats are comma-separated rather than dot-separated (e.g. de_DE) can confuse Pd's underlying float-parsing mechanism.; #X msg 66 173 bang; -#X text 226 173 "bang" : alias for "set"; #X text 224 69 "set CATEGORY VALUE" : set CATEGORY to VALUE; #X msg 64 151 which; #X text 226 153 "which" : list supported categories; +#X text 226 173 "bang" : alias for "set \, set LC_NUMERIC C"; #X connect 1 0 2 0; #X connect 4 0 1 0; #X connect 6 0 1 0; @@ -30,4 +30,4 @@ LANG) to a locale whose floats are comma-separated rather than dot-separated #X connect 8 0 1 0; #X connect 11 0 1 0; #X connect 15 0 1 0; -#X connect 18 0 1 0; +#X connect 17 0 1 0; diff --git a/locale/src/locale.c b/locale/src/locale.c index b74a0e1..787f5be 100644 --- a/locale/src/locale.c +++ b/locale/src/locale.c @@ -2,7 +2,7 @@ /*=============================================================================*\ * File: locale.c * Author: Bryan Jurish <moocow@ling.uni-potsdam.de> - * Description: general directory access object + * Description: C99 locale support * * Copyright (c) 2009 Bryan Jurish. * @@ -32,12 +32,6 @@ #include <m_pd.h> -/* black magic */ -#ifdef NT -#pragma warning( disable : 4244 ) -#pragma warning( disable : 4305 ) -#endif - #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -73,7 +67,7 @@ static char *locale_banner = "\nlocale: C99 locale support version " PACKAGE_VERSION " by Bryan Jurish\n" - "locale: compiled by " PDMOOEXT_USER " on " PDMOOEXT_DATE ; + "locale: compiled by " PACKAGE_BUILD_USER " on " PACKAGE_BUILD_DATE ; static t_class *locale_class; @@ -261,6 +255,7 @@ static t_symbol *cat2sym(t_object *obj, int cat) static void locale_bang(t_locale *x) { setlocale(LC_ALL,""); + setlocale(LC_NUMERIC,"C"); } /*-------------------------------------------------------------------- @@ -287,7 +282,7 @@ static void locale_get(t_locale *x, t_symbol *catsym) static void locale_set(t_locale *x, t_symbol *catsym, t_symbol *valsym) { int cat; - if (catsym==&s_ && valsym==&s_) { locale_bang(x); return; } + if (catsym==&s_ && valsym==&s_) { setlocale(LC_ALL,""); return; } cat = sym2cat((t_object*)x,catsym); setlocale(cat,valsym->s_name); } diff --git a/locale/src/uselocale.c b/locale/src/uselocale.c new file mode 100644 index 0000000..5c95367 --- /dev/null +++ b/locale/src/uselocale.c @@ -0,0 +1,48 @@ +/* -*- Mode: C -*- */ +/*=============================================================================*\ + * File: uselocale.c + * Author: Bryan Jurish <moocow@ling.uni-potsdam.de> + * Description: set default locale, for use with -lib + * + * Copyright (c) 2009 Bryan Jurish. + * + * For information on usage and redistribution, and for a DISCLAIMER OF ALL + * WARRANTIES, see the file, "LICENSE.txt," in this distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * See file LICENSE for further informations on licensing terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *=============================================================================*/ + +#include <m_pd.h> + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif + +/*===================================================================== + * Setup + *=====================================================================*/ + +void uselocale_setup(void) +{ + setlocale(LC_ALL,""); + setlocale(LC_NUMERIC,"C"); + post("uselocale: %s", setlocale(LC_ALL,NULL)); +} |