From a78556293853d334ace051def729082fa787e6e9 Mon Sep 17 00:00:00 2001 From: mdw Date: Wed, 24 Sep 2003 22:45:57 +0000 Subject: [PATCH] Support Automake's `aclocal' scheme. Deposit Autoconf fragments in `aclocal's' repository. Apply heinous bodging to `txtlib' and `mkaclocal'. --- Makefile.am | 14 +- aclocal.glob | 1163 +--------------------------------------------------------- configure.in | 12 +- install-ac | 57 +++ mkaclocal.in | 16 +- txtlib.in | 17 +- 6 files changed, 118 insertions(+), 1161 deletions(-) create mode 100755 install-ac diff --git a/Makefile.am b/Makefile.am index 414f173..93c225c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with Automake to generate `Makefile.in' ## -*-Makefile-*- ## -## $Id: Makefile.am,v 1.5 2003/05/15 23:39:15 mdw Exp $ +## $Id: Makefile.am,v 1.6 2003/09/24 22:45:57 mdw Exp $ ## ## Building the distribution ## @@ -29,6 +29,11 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.am,v $ +## Revision 1.6 2003/09/24 22:45:57 mdw +## Support Automake's `aclocal' scheme. Deposit Autoconf fragments in +## `aclocal's' repository. Apply heinous bodging to `txtlib' and +## `mkaclocal'. +## ## Revision 1.5 2003/05/15 23:39:15 mdw ## Distribute `maninst' script ## @@ -60,7 +65,7 @@ pkgdata_DATA = \ COPYING COPYING.LIB INSTALL \ ansi2knr.1 ansi2knr.c \ gpl.tex lgpl.tex gpl.texi lgpl.texi texinfo.tex texinice.tex \ - aclocal.glob lib-config.in \ + lib-config.in \ mdwopt.c mdwopt.h \ getdate.y getdate.h @@ -73,6 +78,11 @@ pkgdata_SCRIPTS = \ NEWSCRIPTS = \ maninst +install-data-hook: + $(srcdir)/install-ac install $(srcdir)/aclocal.glob $(aclocaldir) +uninstall-hook: + $(srcdir)/install-ac rm $(srcdir)/aclocal.glob $(aclocaldir) + ## --- Documentation --- info_TEXINFOS = common.texi diff --git a/aclocal.glob b/aclocal.glob index 8da0c04..b687e5c 100644 --- a/aclocal.glob +++ b/aclocal.glob @@ -1,6 +1,6 @@ dnl -*-fundamental-*- *@--GLOB-HEADER--@* dnl -dnl $Id: aclocal.glob,v 1.16 2003/04/23 12:47:22 mdw Exp $ +dnl $Id: aclocal.glob,v 1.17 2003/09/24 22:45:57 mdw Exp $ dnl dnl Common library of autoconf macros dnl @@ -28,6 +28,11 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl----- Revision history --------------------------------------------------- dnl dnl $Log: aclocal.glob,v $ +dnl Revision 1.17 2003/09/24 22:45:57 mdw +dnl Support Automake's `aclocal' scheme. Deposit Autoconf fragments in +dnl `aclocal's' repository. Apply heinous bodging to `txtlib' and +dnl `mkaclocal'. +dnl dnl Revision 1.16 2003/04/23 12:47:22 mdw dnl Add mdw_MANEXT. dnl @@ -80,1148 +85,8 @@ dnl Revision 1.1.1.1 1999/05/05 19:23:47 mdw dnl New import. The old CVS repository was lost in a disk disaster. dnl -dnl----- Common files distribution --------------------------- *@--NOTICE--@* -dnl -dnl $Id: aclocal.glob,v 1.16 2003/04/23 12:47:22 mdw Exp $ - -dnl --- *@-AM_PROG_CC_STDC-@* --- -dnl -dnl Author: Franc,ois Pinard -dnl -dnl Synopsis: AM_PROG_CC_STDC -dnl -dnl Arguments: --- -dnl -dnl Use: If the C compiler in not in ANSI C mode by default, try to -dnl add an option to output variable `CC' to make it so. This -dnl macro tries various options that select ANSI C on some system -dnl or another. It considers the compiler to be in ANSI C mode -dnl if it defines `__STDC__' to 1 and handles function prototypes -dnl correctly. -dnl -dnl If you use this macro, you should check after calling it -dnl whether the C compiler has been set to accept ANSI C; if not, -dnl the shell variable `ac_cv_prog_cc_stdc' is set to `no'. If -dnl you wrote your source code in ANSI C, you can make an -dnl un-ANSIfied copy of it by using the program `ansi2knr', which -dnl comes with Ghostscript. -dnl -dnl (documentation by Franc,ois Pinard) - -AC_DEFUN(AM_PROG_CC_STDC, -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#if !defined(__STDC__) || __STDC__ != 1 -choke me -#endif -/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */ -#ifdef _SEQUENT_ -# include -# include -#endif -], [ -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);};], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" -]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT($am_cv_prog_cc_stdc) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac -]) - -dnl----- AutoMake macros ------------------------------------- *@--IGNORE--@* - -dnl --- *@-AM_CONDITIONAL-@* --- -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_CONDITIONAL(NAME, TEST) -dnl -dnl Arguments: NAME = name of the conditional -dnl TEST = a shell list to execute -dnl -dnl Use: Allows conditional sections in Makefiles. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -dnl --- *@-AM_CYGWIN32-@* --- -dnl -dnl Author: Cygnus (I guess) -dnl -dnl Synopsis: AM_CYGWIN32 -dnl -dnl Arguments: --- -dnl -dnl Use: Check to see if we're running under Cygwin32, without using -dnl AC_CANONICAL_*. If so, set output variable EXEEXT to -dnl ".exe". Otherwise set it to "". - -dnl AM_CYGWIN32() -dnl You might think we can do this by checking for a cygwin32-specific -dnl cpp define. We can't, because cross-compilers that target -dnl cygwin32 don't use the .exe suffix. I don't know why. -AC_DEFUN(AM_CYGWIN32, -[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, -[cat > conftest.$ac_ext << 'EOF' -int main () { -/* Nothing. */ -return 0; } -EOF -if AC_TRY_EVAL(ac_link) && test -s conftest.exe; then - am_cv_cygwin32=yes -else - am_cv_cygwin32=no -fi -rm -f conftest*]) -EXEEXT= -test "$am_cv_cygwin32" = yes && EXEEXT=.exe -AC_SUBST(EXEEXT)]) - -dnl --- *@-AM_WITH_DMALLOC-@* --- -dnl -dnl Author: Franc,ois Pinard -dnl -dnl Synopsis: AM_WITH_DMALLOC -dnl -dnl Arguments: --- -dnl -dnl Use: Links with `-dmalloc' if told to by the user. - -## ----------------------------------- ## -## Check if --with-dmalloc was given. ## -## From Franc,ois Pinard ## -## ----------------------------------- ## - -# serial 1 - -AC_DEFUN(AM_WITH_DMALLOC, -[AC_MSG_CHECKING(if malloc debugging is wanted) -AC_ARG_WITH(dmalloc, -[ --with-dmalloc use dmalloc, as in - ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz], -[if test "$withval" = yes; then - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_DMALLOC) - LIBS="$LIBS -ldmalloc" - LDFLAGS="$LDFLAGS -g" -else - AC_MSG_RESULT(no) -fi], [AC_MSG_RESULT(no)]) -]) - -dnl --- *@-AM_FUNC_ERROR_AT_LINE-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: AM_FUNC_ERROR_AT_LINE -dnl -dnl Arguments: --- -dnl -dnl Use: Use this if you use the GNU error.[ch]. - -dnl FIXME: Migrate into libit - -AC_DEFUN(AM_FUNC_ERROR_AT_LINE, -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], - am_cv_lib_error_at_line=yes, - am_cv_lib_error_at_line=no)]) - if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.o" - fi - AC_SUBST(LIBOBJS)dnl -]) - -dnl --- *@-AM_INIT_GUILE_MODULE-@* --- -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_INIT_GUILE_MODULE(MODNAME) -dnl -dnl Arguments: MODNAME = value to initialize `module' variable with -dnl -dnl Use: This macro will automatically get the guile version from the -dnl top-level srcdir, and will initialize automake. It also -dnl defines the `module' variable. - -AC_DEFUN([AM_INIT_GUILE_MODULE],[ -. $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_CONFIG_AUX_DIR(..) -module=[$1] -AC_SUBST(module)]) - -dnl --- *@-AM_CONFIG_HEADER-@* --- -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_CONFIG_HEADER(HEADER ...) -dnl -dnl Arguments: HEADER = a header spec, as for AC_CONFIG_HEADER -dnl -dnl Use: Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/ -\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - -dnl --- *@-AM_INIT_AUTOMAKE-@* -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -dnl -dnl Arguments: PACKAGE = package name -dnl VERSION = version number -dnl NO-DEFINE = if set, don't define package and version number -dnl -dnl Use: Do all the work for Automake. This macro actually does too -dnl much -- some checks are only needed if your package does -dnl certain things. But this isn't really a big deal. - -# serial 1 - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -dnl --- *@-AM_PROG_LEX-@* --- -dnl -dnl Author: Alexandre Oliva -dnl -dnl Synopsis: AM_PROG_LEX -dnl -dnl Arguments: --- -dnl -dnl Use: Replacement for AC_PROG_LEX and AC_DECL_YYTEXT - -dnl AM_PROG_LEX -dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT -AC_DEFUN(AM_PROG_LEX, -[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) -AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") -AC_PROG_LEX -AC_DECL_YYTEXT]) - -dnl --- *@-AM_PROG_LIBTOOL-@* --- -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_PROG_LIBTOOL -dnl -dnl Arguments: --- -dnl -dnl Use: Configures `libtool' for the target architecture. - -## -## Configure libtool for the target system. -## -# serial 1 AM_PROG_LIBTOOL -AC_DEFUN(AM_PROG_LIBTOOL, -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_CC]) -AC_REQUIRE([AC_PROG_RANLIB]) - -# Always use our own libtool. -LIBTOOL='$(top_builddir)/libtool' -AC_SUBST(LIBTOOL) - -dnl Allow the --disable-shared flag to stop us from building shared libs. -AC_ARG_ENABLE(shared, -[ --enable-shared build shared libraries [default=yes]], -test "$enableval" = no && libtool_shared=" --disable-shared", -libtool_shared=) - -libtool_flags="$libtool_shared" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" RANLIB="$RANLIB" \ -$ac_aux_dir/ltconfig $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) -]) - -dnl --- *@-AM_PATH_LISPDIR-@* --- -dnl -dnl Author: Ulrich Drepper -dnl -dnl Synopsis: AM_PATH_LISPDIR -dnl -dnl Arguments: --- -dnl -dnl Use: Sets the variable `lispdir' to point to a place to install -dnl Emacs lisp files. - -## ------------------------ -## Emacs LISP file handling -## From Ulrich Drepper -## ------------------------ - -# serial 1 - -AC_DEFUN(AM_PATH_LISPDIR, - [# If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - AC_PATH_PROG(EMACS, emacs xemacs, no) - if test $EMACS != "no"; then - AC_MSG_CHECKING([where .elc files should go]) - dnl Set default value - lispdir="\$(datadir)/emacs/site-lisp" - if test "x$prefix" = "xNONE"; then - if test -d $ac_default_prefix/share/emacs/site-lisp; then - lispdir="\$(prefix)/share/emacs/site-lisp" - else - if test -d $ac_default_prefix/lib/emacs/site-lisp; then - lispdir="\$(prefix)/lib/emacs/site-lisp" - fi - fi - else - if test -d $prefix/share/emacs/site-lisp; then - lispdir="\$(prefix)/share/emacs/site-lisp" - else - if test -d $prefix/lib/emacs/site-lisp; then - lispdir="\$(prefix)/lib/emacs/site-lisp" - fi - fi - fi - AC_MSG_RESULT($lispdir) - fi - AC_SUBST(lispdir)]) - -dnl --- *@-AM_MAINTAINTER_MODE-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: jm_MAINTAINER_MODE -dnl -dnl Arguments: --- -dnl -dnl Use: Provides an option `--enable-maintainer-mode' which turns -dnl on rules which might normally be commented out. The -dnl substitution variable `MAINT' is set to be a comment when -dnl this option is disabled, which it is by default. - -# serial 1 - -AC_DEFUN(AM_MAINTAINER_MODE, -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - if test $USE_MAINTAINER_MODE = yes; then - MAINT= - else - MAINT='#M#' - fi - AC_SUBST(MAINT)dnl -] -) - -dnl --- *@-AM_MISSING_PROG-@* --- -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl -dnl Arguments: NAME = variable to set to the file's location -dnl PROGRAM = name of program to find -dnl DIRECTORY = directory to look in -dnl -dnl Use: Fakes existence of a useful GNU maintainer tool. - -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -dnl --- *@-AM_FUNC_MKTIME-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: AM_FUNC_MKTIME -dnl -dnl Arguments: --- -dnl -dnl Use: Checks for a working mktime function. - -AC_DEFUN(AM_FUNC_MKTIME, -[AC_REQUIRE([AC_HEADER_TIME])dnl - AC_CHECK_HEADERS(sys/time.h) - AC_CACHE_CHECK([for working mktime], am_cv_func_working_mktime, - [AC_TRY_RUN( -changequote(<<, >>)dnl -< -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -static time_t time_t_max; - -/* Values we'll use to set the TZ environment variable. */ -static const char *const tz_strings[] = { - NULL, "GMT0", "JST-9", "EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -static void -mktime_test (now) - time_t now; -{ - if (mktime (localtime (&now)) != now) - exit (1); - now = time_t_max - now; - if (mktime (localtime (&now)) != now) - exit (1); -} - -int -main () -{ - time_t t, delta; - int i; - - for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) - continue; - time_t_max--; - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) - mktime_test (t); - mktime_test ((time_t) 60 * 60); - mktime_test ((time_t) 60 * 60 * 24); - } - exit (0); -} - >>, -changequote([, ])dnl - am_cv_func_working_mktime=yes, am_cv_func_working_mktime=no, - dnl When crosscompiling, assume mktime is missing or broken. - am_cv_func_working_mktime=no) - ]) - if test $am_cv_func_working_mktime = no; then - LIBOBJS="$LIBOBJS mktime.o" - fi -]) - -dnl --- *@-AM_FUNC_OBSTACK-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: AM_FUNC_OBSTACK -dnl -dnl Arguments: --- -dnl -dnl Use: Checks for GNU obstacks. - -AC_DEFUN(AM_FUNC_OBSTACK, -[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, - [AC_TRY_LINK([#include "obstack.h"], - [struct obstack *mem;obstack_free(mem,(char *) 0)], - am_cv_func_obstack=yes, - am_cv_func_obstack=no)]) - if test $am_cv_func_obstack = yes; then - AC_DEFINE(HAVE_OBSTACK) - else - LIBOBJS="$LIBOBJS obstack.o" - fi -]) - -dnl --- *@-AC_C_PROTOTYPES-@* --- -dnl -dnl Author: Franc,ois Pinard -dnl -dnl Synopsis: AC_C_PROTOTYPES -dnl -dnl Arguments: --- -dnl -dnl Use: If the C compiler understands ANSI C, define `PROTOTYPES', -dnl and clear the `U' and `ANSI2KNR' variables. Otherwise, -dnl set `U' to be `_' and `ANSI2KNR' to be `./ansi2knr'. - -# serial 1 - -AC_DEFUN(fp_C_PROTOTYPES, -[AC_REQUIRE([AM_PROG_CC_STDC]) -AC_MSG_CHECKING([for function prototypes]) -if test "$ac_cv_prog_cc_stdc" != no; then - AC_MSG_RESULT(yes) - AC_DEFINE(PROTOTYPES) - U= ANSI2KNR= -else - AC_MSG_RESULT(no) - U=_ ANSI2KNR=./ansi2knr -fi -AC_SUBST(U)dnl -AC_SUBST(ANSI2KNR)dnl -]) - -dnl --- *@-AM_PATH_GTK-@* --- -dnl -dnl Author: Owen Taylor -dnl -dnl Synopsis: AM_PATH_GTK(MIN-VERSION, [ACTION-IF-FOUND], [ACTION-IF-NOT]) -dnl -dnl Arguments: MIN-VERSION = minimum version of GTK required -dnl ACTION-IF-FOUND = executed if GTK found OK -dnl ACTION-IF-NOT-FOUND = what to do if GTK not available -dnl -dnl Use: Sets up compilation environment suitably for GTK programming. - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) - -dnl --- *@-AM_PATH_SDL-@* --- -dnl -dnl Author: Sam Langinga -dnl -dnl Synopsis: AM_PATH_SDL([VERSION, [IF-FOUND, [IF-NOT-FOUND]]]) -dnl -dnl Arguments: VERSION = minimum required version -dnl IF-FOUND = what to do if found -dnl IF-NOT-FOUND = what to do if not found -dnl -dnl Use: Test for SDL, and define SDL_CFLAGS and SDL_LIBS - -# Configure paths for SDL -# Sam Lantinga 9/21/99 -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -dnl -AC_DEFUN(AM_PATH_SDL, -[dnl -dnl Get the cflags and libraries from the sdl-config script -dnl -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], - sdl_prefix="$withval", sdl_prefix="") -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], - sdl_exec_prefix="$withval", sdl_exec_prefix="") -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], - , enable_sdltest=yes) - - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - AC_PATH_PROG(SDL_CONFIG, sdl-config, no) - min_sdl_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_sdltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SDL is sufficiently new. (Also sanity -dnl checks the results of sdl-config to some extent -dnl - rm -f conf.sdltest - AC_TRY_RUN([ -#include -#include -#include -#include "SDL.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_sdl_version"); - exit(1); - } - - if (($sdl_major_version > major) || - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_sdl" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" - echo "*** full path to sdl-config." - else - if test -f conf.sdltest ; then - : - else - echo "*** Could not run SDL test program, checking why..." - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ -#include -#include "SDL.h" -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SDL_CFLAGS="" - SDL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - rm -f conf.sdltest -]) - -dnl --- *@-AC_TYPE_PTRDIFF_T-@* --- -dnl -dnl Author: Ulrich Drepper -dnl -dnl Synopsis: AC_TYPE_PTRDIFF_T -dnl -dnl Arguments: --- -dnl -dnl Use: Sets HAVE_PTRDIFF_T if the type exists. - -AC_DEFUN(AM_TYPE_PTRDIFF_T, - [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t, - [AC_TRY_COMPILE([#include ], [ptrdiff_t p], - am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)]) - if test $am_cv_type_ptrdiff_t = yes; then - AC_DEFINE(HAVE_PTRDIFF_T) - fi -]) - -dnl --- *@-AM_WITH_REGEX-@* --- -dnl -dnl Author: Unknown (possibly Franc,ois Pinard) -dnl -dnl Synopsis: AM_WITH_REGEX -dnl -dnl Arguments: --- -dnl -dnl Use: -dnl The idea is to distribute rx.[hc] and regex.[hc] together, -dnl for a while. The WITH_REGEX symbol (which should also be -dnl documented in acconfig.h) is used to decide which of regex.h -dnl or rx.h should be included in the application. If -dnl `./configure --with-regex' is given (the default), the -dnl package will use gawk's regex. If `./configure -dnl --without-regex', a check is made to see if rx is already -dnl installed, as with newer Linux'es. If not found, the package -dnl will use the rx from the distribution. If found, the package -dnl will use the system's rx which, on Linux at least, will -dnl result in a smaller executable file. - -AC_DEFUN(AM_WITH_REGEX, -[AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted) -AC_ARG_WITH(regex, -[ --without-regex use GNU rx in lieu of gawk's regex for matching], -[test "$withval" = yes && am_with_regex=1], -[am_with_regex=1]) -if test -n "$am_with_regex"; then - AC_MSG_RESULT(regex) - AC_DEFINE(WITH_REGEX) - AC_CACHE_CHECK([for GNU regex in libc], am_cv_gnu_regex, - AC_TRY_LINK([], [extern int re_max_failures; re_max_failures = 1], - am_cv_gnu_regex=yes, am_cv_gnu_regex=no)) - if test $am_cv_gnu_regex = no; then - LIBOBJS="$LIBOBJS regex.o" - fi -else - AC_MSG_RESULT(rx) - AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.o"]) -fi -AC_SUBST(LIBOBJS)dnl -]) - -dnl --- *@-AM_SANITY_CHECK-@* -dnl -dnl Author: Unknown -dnl -dnl Synopsis: AM_SANITY_CHECK -dnl -dnl Arguments: --- -dnl -dnl Use: Check for build environment sanity. - -AC_DEFUN(AM_SANITY_CHECK, -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$@" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl --- *@-AM_FUNC_STRDOD-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: AM_FUNC_STRTOD -dnl -dnl Arguments: --- -dnl -dnl Use: Checks for a working strtod function. - -## Copyright (C) 1996 Free Software Foundation, Inc. - -## 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, or (at your option) -## any later version. - -## 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. - -## From Jim Meyering. - -## serial 1 - -## @defmac AC_FUNC_STRTOD -## @maindex FUNC_STRTOD -## @ovindex LIBOBJS -## If the @code{strtod} function is not available, or does not work -## correctly (like the one on SunOS 5.4), add @samp{strtod.o} to output -## variable @code{LIBOBJS}. -## @end defmac - -AC_DEFUN(AM_FUNC_STRTOD, -[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod, -[AC_TRY_RUN([ -double strtod (); -int -main() -{ - { - /* Some versions of Linux strtod mis-parse strings with leading '+'. */ - char *string = " +69"; - char *term; - double value; - value = strtod (string, &term); - if (value != 69 || term != (string + 4)) - exit (1); - } - - { - /* Under Solaris 2.4, strtod returns the wrong value for the - terminating character under some conditions. */ - char *string = "NaN"; - char *term; - strtod (string, &term); - if (term != string && *(term - 1) == 0) - exit (1); - } - exit (0); -} -], am_cv_func_strtod=yes, am_cv_func_strtod=no, am_cv_func_strtod=no)]) -test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o" -AC_SUBST(LIBOBJS)dnl -am_cv_func_strtod_needs_libm=no -if test $am_cv_func_strtod = no; then - AC_CHECK_FUNCS(pow) - if test $ac_cv_func_pow = no; then - AC_CHECK_LIB(m, pow, [am_cv_func_strtod_needs_libm=yes], - [AC_MSG_WARN(can't find library containing definition of pow)]) - fi -fi -]) - -dnl --- *@-AM_SYS_POSIX_TERMIOS-@* --- -dnl -dnl Author: Jim Meyering -dnl -dnl Synopsis: AM_SYS_POSIX_TERMIOS -dnl -dnl Arguments: --- -dnl -dnl Use: Checks for a POSIX termios.h. - -AC_DEFUN(AM_SYS_POSIX_TERMIOS, -[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios, - [AC_TRY_LINK([#include -#include -#include ], - [/* SunOS 4.0.3 has termios.h but not the library calls. */ - tcgetattr(0, 0);], - am_cv_sys_posix_termios=yes, - am_cv_sys_posix_termios=no)]) -]) - -dnl----- Macros by Mark Wooding ------------------------------ *@--IGNORE--@* +dnl *@--NOTICE--@* Common File Distribution +dnl $Id: aclocal.glob,v 1.17 2003/09/24 22:45:57 mdw Exp $ dnl --- *@-mdw_REQUIRE-@* --- dnl @@ -1523,7 +388,7 @@ if test "$GXX" = "yes"; then CXXFLAGS="$CXXFLAGS ifelse([$3], [], [-fhandle-exceptions], [$3])" fi]) -dnl *@-mdw_INIT_LIB-@* +dnl --- *@-mdw_INIT_LIB-@* --- dnl dnl Author: Mark Wooding dnl @@ -1543,7 +408,7 @@ AC_DEFUN([mdw_INIT_LIB], LIBRARY="$1" AC_SUBST(LIBRARY) LIBNAME="$2" AC_SUBST(LIBNAME)]) -dnl *@-mdw_LIB_CONFIG-@* +dnl --- *@-mdw_LIB_CONFIG-@* --- dnl dnl Author: Mark Wooding dnl @@ -1589,7 +454,7 @@ else fi popdef([upname])]) -dnl *@-mdw_MLIB-@* +dnl --- *@-mdw_MLIB-@* --- dnl dnl Author: Mark Wooding dnl @@ -1603,7 +468,7 @@ dnl Use: Configures an mLib client program. AC_DEFUN([mdw_MLIB], [mdw_LIB_CONFIG(mLib, mLib, $@)]) -dnl *@-mdw_MGLIB-@* +dnl --- *@-mdw_MGLIB-@* --- dnl dnl Author: Mark Wooding dnl @@ -1619,7 +484,7 @@ AC_DEFUN([mdw_MGLIB], [mdw_REQUIRE([mdw_MLIB], [1.6.0]) mdw_LIB_CONFIG(mgLib, mgLib, $@)]) -dnl *@-mdw_CATACOMB-@* +dnl --- *@-mdw_CATACOMB-@* --- dnl dnl Author: Mark Wooding dnl @@ -1635,7 +500,7 @@ AC_DEFUN([mdw_CATACOMB], [mdw_REQUIRE([mdw_MLIB], [1.6.0]) mdw_LIB_CONFIG(catacomb, Catacomb, $@)]) -dnl *@-mdw_PK-@* +dnl --- *@-mdw_PK-@* --- dnl dnl Author: Mark Wooding dnl diff --git a/configure.in b/configure.in index 48ecad2..1c8ca0a 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl -*-fundamental-*- dnl -dnl $Id: configure.in,v 1.11 2003/04/05 09:12:13 mdw Exp $ +dnl $Id: configure.in,v 1.12 2003/09/24 22:45:57 mdw Exp $ dnl dnl Configuring the Common Files Distribution dnl @@ -28,6 +28,11 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl----- Revision history --------------------------------------------------- dnl dnl $Log: configure.in,v $ +dnl Revision 1.12 2003/09/24 22:45:57 mdw +dnl Support Automake's `aclocal' scheme. Deposit Autoconf fragments in +dnl `aclocal's' repository. Apply heinous bodging to `txtlib' and +dnl `mkaclocal'. +dnl dnl Revision 1.11 2003/04/05 09:12:13 mdw dnl Tool for installing manpages. dnl @@ -43,4 +48,9 @@ dnl AC_INIT(mklinks.in) AM_INIT_AUTOMAKE(common, 1.2.9) +AC_CACHE_CHECK([where to stash Autoconf macros], [aclocaldir], [ + aclocaldir=`aclocal --print-ac-dir` + if test $? -ne 0; then AC_MSG_ERROR([aclocal not installed]); fi +]) +AC_SUBST(aclocaldir) AC_OUTPUT(Makefile mklinks findlinks txtlib mkaclocal) diff --git a/install-ac b/install-ac new file mode 100755 index 0000000..34a3578 --- /dev/null +++ b/install-ac @@ -0,0 +1,57 @@ +#! /bin/sh + +set -e +if [ $# -ne 3 ]; then + echo >&2 "usage: $0 install|rm GLOB DIR" + exit 1 +fi + +mode=$1 glob=$2 dir=$3 +case $mode in + rm) + printf "Uninstalling aclocal fragments... " + awk -v dir="$dir" ' + /\*@-([a-zA-Z0-9][-a-zA-Z0-9_]*)-@\*/ { + out = $0; + sub(/^.*\*@-/, "", out); + sub(/-@\*.*$/, "", out); + system(sprintf("rm %s/%s.m4", dir, out)); + }' <"$glob" + echo "done." + ;; + install) + printf "Installing aclocal fragments... " + awk -v dir="$dir" ' + BEGIN { out = ""; delete files; notice = ""} + /\*@--NOTICE--@\*/ { + if (out != "") close(out); + out = "NOTICE"; + notice = $0 "\n"; + next; + } + /\*@-([a-zA-Z0-9][-a-zA-Z0-9_]*)-@\*/ { + if (out != "") close(out); + out = $0; + sub(/^.*\*@-/, "", out); + sub(/-@\*.*$/, "", out); + files[out] = 1; + out = sprintf("%s/%s.new", dir, out); + printf "%s", notice >(out); + } + /\*@--[-a-zA-Z0-9_]*-@\*/ { next; } + { + if (out == "NOTICE") + notice = notice $0 "\n"; + else + if (out != "") print $0 >(out); + } + END { + for (f in files) + system(sprintf("mv %s/%s.new %s/%s.m4", dir, f, dir, f)); + }' <"$glob" + echo "done." + ;; + *) echo >&2 "bad mode argument"; exit 1;; +esac + +awk \ No newline at end of file diff --git a/mkaclocal.in b/mkaclocal.in index 8a56ac4..c425633 100755 --- a/mkaclocal.in +++ b/mkaclocal.in @@ -30,6 +30,8 @@ # # $Log$ +set -e + # --- Configuration variables --- prefix=@prefix@ @@ -132,13 +134,12 @@ EOF done if $stdlib; then - set \ - "$datadir/aclocal.glob" \ + set -- \ `test -r $datadir/aclocal.site && echo "$datadir/aclocal.site"` \ `test -r ./aclocal.lib && echo "./aclocal.lib"` \ "$@" else - set \ + set -- \ `test -r ./aclocal.lib && echo "./aclocal.lib"` \ "$@" fi @@ -153,6 +154,11 @@ case $mode in x) t=${TMPDIR-/tmp}/mkaclocal.$$ + doaclocal=false + if $stdlib && [ $out = aclocal.m4 ]; then + doaclocal=true + out=acinclude.m4 + fi if mkdir -m700 $t; then : else echo >&2 "mkaclocal: cculd not create temporary directory" @@ -180,11 +186,13 @@ $LINE" grep "\*@--TOP--@\*" ./aclocal.lib >/dev/null && sed -e "/\*@--TOP--@\*/, $ d" ./aclocal.lib cat $out.tmp - } >$out + } >$out.new + mv $out.new $out else rm -f $out fi rm -fr $t $out.tmp + if $doaclocal; then aclocal; fi ;; esac diff --git a/txtlib.in b/txtlib.in index 6c4fbec..4db6917 100755 --- a/txtlib.in +++ b/txtlib.in @@ -2,7 +2,7 @@ # -*-sh-*- # -# $Id: txtlib.in,v 1.3 2001/01/20 12:02:12 mdw Exp $ +# $Id: txtlib.in,v 1.4 2003/09/24 22:45:57 mdw Exp $ # # Manipulate simple libraries of text chunks # @@ -30,6 +30,11 @@ #----- Revision history ----------------------------------------------------- # # $Log: txtlib.in,v $ +# Revision 1.4 2003/09/24 22:45:57 mdw +# Support Automake's `aclocal' scheme. Deposit Autoconf fragments in +# `aclocal's' repository. Apply heinous bodging to `txtlib' and +# `mkaclocal'. +# # Revision 1.3 2001/01/20 12:02:12 mdw # Honour TMPDIR environment variable. # @@ -40,6 +45,8 @@ # New import. The old CVS repository was lost in a disk disaster. # +set -e + # --- Handle command line arguments --- files="" @@ -70,7 +77,7 @@ EOF exit 0 ;; -v | --v | --ve | --ver | --vers | --versi | --versio | --version) - version=`echo '$Revision: 1.3 $' | + version=`echo '$Revision: 1.4 $' | sed -n -e 's;^.*: \([0-9.]*\) *\\$;\1;p'` echo "txtlib $version; Common Files Distribution version @VERSION@" exit 0 @@ -115,7 +122,7 @@ test "$out" = "-" && out="" case $mode in l) - sed -n -e "/^.*\*@-\([-a-zA-Z0-9_]*\)-@\*.*$/ s//\1/p" "$@" + sed -n -e "/^.*\*@-\([-a-zA-Z0-9_]*\)-@\*.*$/ s//\1/p" /dev/null "$@" ;; x) t=${TMPDIR-/tmp}/txtlib.$$ @@ -128,9 +135,9 @@ case $mode in while read LINE; do echo "/\*@-$LINE-@\*/,/\*@-#-@\*/ p" done >$sedfile - test -z "$out" || exec >$out + test -z "$out" || exec >"$out" sed -e '/\*@-[-a-zA-Z0-9_]*-@\*/ i\ - *@-#-@*' "$@" | sed -n -f $sedfile | sed -e '/\*@-#-@\*/ d' + *@-#-@*' /dev/null "$@" | sed -n -f $sedfile | sed -e '/\*@-#-@\*/ d' rm -rf $t ;; esac -- 2.11.0