From: <enl...@li...> - 2002-08-05 00:22:40
|
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast Modified Files: ChangeLog Makefile.am acconfig.h configure.in libast-config.in libast.spec Added Files: libast.m4 Removed Files: acinclude.m4 Log Message: Sun Aug 4 20:11:38 2002 Michael Jennings (mej) Did a complete overhaul of the configure.in script. Moved everything to macros in libast.m4, which is now installed by the package. That will facilitate easier development of libast-based programs. Also added the beginnings of a regexp class with support for PCRE, POSIX-, and BSD-style regular expressions. =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ChangeLog 31 Jul 2002 21:56:55 -0000 1.49 +++ ChangeLog 5 Aug 2002 00:22:09 -0000 1.50 @@ -278,3 +278,12 @@ UNIX socket. Then I send/receive data across the socket and compare what I received with what I sent. Self-contained is better. :-) ---------------------------------------------------------------------- +Sun Aug 4 20:11:38 2002 Michael Jennings (mej) + +Did a complete overhaul of the configure.in script. Moved everything +to macros in libast.m4, which is now installed by the package. That +will facilitate easier development of libast-based programs. + +Also added the beginnings of a regexp class with support for PCRE, +POSIX-, and BSD-style regular expressions. +---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 3 Mar 2002 06:47:48 -0000 1.8 +++ Makefile.am 5 Aug 2002 00:22:09 -0000 1.9 @@ -1,16 +1,25 @@ -# $Id: Makefile.am,v 1.8 2002/03/03 06:47:48 mej Exp $ +# $Id: Makefile.am,v 1.9 2002/08/05 00:22:09 mej Exp $ AUTOMAKE_OPTIONS = foreign SUBDIRS = include src test bin_SCRIPTS = libast-config -EXTRA_DIST = README +MACROS = libast.m4 +macrodir = $(datadir)/aclocal + +EXTRA_DIST = README $(MACROS) test: all cd test && $(MAKE) test perf: all cd test && $(MAKE) perf + +install-data-hook: + $(mkinstalldirs) $(DESTDIR)$(macrodir) + for i in $(MACROS) ; do \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(macrodir)/ ; \ + done .PHONY: test =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/acconfig.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- acconfig.h 3 Mar 2002 06:47:48 -0000 1.3 +++ acconfig.h 5 Aug 2002 00:22:09 -0000 1.4 @@ -7,4 +7,10 @@ #undef LIBAST_X11_SUPPORT #undef LIBAST_IMLIB2_SUPPORT #undef LIBAST_MMX_SUPPORT +#undef LIBAST_REGEXP_SUPPORT #undef ALLOW_BACKQUOTE_EXEC +#undef HAVE_RLIMIT_MEMLOCK +#undef HAVE_RLIMIT_NPROC +#undef HAVE_SYMLINK_OPEN_ERRNO_BUG +#undef HAVE_SYMLINK_OPEN_SECURITY_HOLE +#undef HAVE_VSNPRINTF_BUG =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- configure.in 17 Feb 2002 17:13:12 -0000 1.9 +++ configure.in 5 Aug 2002 00:22:09 -0000 1.10 @@ -1,4 +1,4 @@ -dnl# $Id: configure.in,v 1.9 2002/02/17 17:13:12 mej Exp $ +dnl# $Id: configure.in,v 1.10 2002/08/05 00:22:09 mej Exp $ AC_INIT(configure.in) AM_INIT_AUTOMAKE(libast, 0.5) @@ -9,203 +9,26 @@ AC_SUBST(AUTHORS) AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS") -AC_PROG_CC -AC_PROG_CPP - -dnl# These must be run after AC_PROG_CC but before any other macros that use -dnl# the C compiler -AC_AIX -AC_ISC_POSIX -AC_MINIX - -dnl# At least make the attempt to support CygWin32 -AC_CYGWIN -AC_ARG_PROGRAM - -AM_PROG_LIBTOOL - -AC_GCC_TRADITIONAL - -AC_PROG_INSTALL - -ASFLAGS="$ASFLAGS -I../" -AS=$CC -AC_SUBST(ASFLAGS) -AC_SUBST(AS) - -dnl# Check for host system type -AC_CANONICAL_HOST - -dnl# Check the sanity of what we've done so far -AM_SANITY_CHECK - -dnl# Most people don't want the developer-only clutter -AM_MAINTAINER_MODE - -dnl# If it's there, what the hell? -AM_WITH_DMALLOC - -dnl# Look for needed programs -AC_CHECK_PROG(SED, sed, sed, false) -AC_CHECK_PROG(RM, rm, rm, true) -AC_CHECK_PROG(CP, cp, cp, false) -AC_CHECK_PROG(CHMOD, chmod, chmod, true) -AC_CHECK_PROG(TAR, tar, tar, tar) -AC_CHECK_PROG(MKDIR, mkdir, mkdir, false) -AC_CHECK_PROG(CTAGS, ctags, ctags, true) -AC_CHECK_PROG(AR, ar, ar, false) -AC_CHECK_PROG(MV, mv, mv, true) -AC_LN_S - -AC_CHECK_SIZEOF(char, 1) -AC_CHECK_SIZEOF(short, 2) -AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(long, 4) -AC_CHECK_SIZEOF(long long, 8) -AC_C_BIGENDIAN - -AST_SIZE_TYPE(8) -AC_SUBST(INT_8_TYPE) -AST_SIZE_TYPE(16) -AC_SUBST(INT_16_TYPE) -AST_SIZE_TYPE(32) -AC_SUBST(INT_32_TYPE) -AST_SIZE_TYPE(64) -AC_SUBST(INT_64_TYPE) - -AC_C_CONST -AC_C_INLINE -AC_PATH_XTRA - -if test ! -z "$X_CFLAGS"; then - if test -z "$CPPFLAGS"; then - CPPFLAGS="$X_CFLAGS" - else - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - fi -fi -if test ! -z "$X_LIBS"; then - if test -z "$LDFLAGS"; then - LDFLAGS="$X_LIBS" - else - LDFLAGS="$LDFLAGS $X_LIBS" - fi -fi - -dnl# -dnl# X LIBRARIES -dnl# -LIBAST_X11_SUPPORT="" -if test "x$no_x" != "xyes"; then - AC_CHECK_LIB(X11, XOpenDisplay, LIBAST_X11_SUPPORT="X11" ; GRLIBS="-lX11" ; AC_DEFINE(LIBAST_X11_SUPPORT)) +AST_STD_CHECKS() +AST_PROG_CHECKS() +AST_VAR_CHECKS() +AST_HEADER_CHECKS() +AST_TYPE_CHECKS() +AST_FUNC_CHECKS() + +AST_ARG_DEBUG(DEBUG) +if test $DEBUG -eq 0 ; then + AC_WARN(*** Debugging support disabled. Client programs will ***) + AC_WARN(*** not have access to any libast debugging routines! ***) fi -AC_SUBST(LIBAST_X11_SUPPORT) -dnl# Checks for header files. -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h termios.h sys/ioctl.h sys/select.h sys/time.h sys/sockio.h sys/byteorder.h malloc.h \ -utmpx.h unistd.h bsd/signal.h regex.h regexp.h stdarg.h) -AC_HEADER_TIME - -dnl# Missing typedefs and replacements -AC_TYPE_MODE_T -AC_CHECK_TYPE(off_t, long) -AC_TYPE_PID_T -AC_TYPE_UID_T - -dnl# Checks for library functions. -AC_TYPE_SIGNAL -AC_CHECK_FUNCS(memmove putenv strsep memmem usleep snprintf strcasestr strcasechr strcasepbrk strrev strnlen) -dps_snprintf_oflow() - -dnl# Did they want debugging? -AC_MSG_CHECKING(for debugging level) -AC_ARG_WITH(debugging, [ --with-debugging[=num] compile in debugging support. num >= 0], [ - if test "$withval" = "yes"; then - withval=4 - else - : - fi - if test "$withval" != "no"; then - AC_MSG_RESULT($withval) - AC_DEFINE_UNQUOTED(DEBUG, $withval) - else - AC_MSG_RESULT(no, disabling all debugging support) - AC_DEFINE_UNQUOTED(DEBUG, 0) - AC_WARN(*** Debugging support disabled. Client programs will ***) - AC_WARN(*** not have access to any libast debugging routines! ***) - fi], [AC_MSG_RESULT(4) - AC_DEFINE_UNQUOTED(DEBUG, 4) -]) - -AC_ARG_WITH(imlib, -[ --with-imlib[=DIR] compile with Imlib support (Imlib residing in DIR/lib) (default)], [ - if test "$withval" != "no"; then - if test "$withval" != "yes"; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - fi - USE_IMLIB=1 - else - USE_IMLIB=0 - fi], [USE_IMLIB=1 -]) -LIBAST_IMLIB2_SUPPORT="" -if test $USE_IMLIB -eq 1 ; then - AC_CHECK_LIB(m, pow, LIBS="-lm $LIBS") - AC_CHECK_LIB(dl, dlopen, LIBS="-ldl $LIBS") - AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS) - AC_CHECK_LIB(Imlib2, imlib_create_image, [ - GRLIBS="-lImlib2 $GRLIBS" - AC_DEFINE(LIBAST_IMLIB2_SUPPORT) - LIBAST_IMLIB2_SUPPORT="Imlib2" - ], [ - AC_WARN(*** Imlib2 support has been disabled because Imlib2 ***) - AC_WARN(*** was not found or could not be linked. ***) - ], $GRLIBS) -fi -AC_SUBST(LIBAST_IMLIB2_SUPPORT) - -AC_MSG_CHECKING(for MMX support) -HAVE_MMX="" -AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], [ - test x$enableval = xyes && HAVE_MMX="yes" - ], [ - if test x$build_os = xlinux-gnu; then - grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes" - fi -]) -LIBAST_MMX_SUPPORT="" -if test -n "$HAVE_MMX"; then - AC_MSG_RESULT(yes) - AC_DEFINE(LIBAST_MMX_SUPPORT) - LIBAST_MMX_SUPPORT="MMX" -else - AC_MSG_RESULT(no) -fi -AC_SUBST(LIBAST_MMX_SUPPORT) - -AC_MSG_CHECKING(if backquote execution support should be enabled) -AC_ARG_WITH(backquote-exec, -[ --without-backquote-exec - disables the execution of commands from inside config files], [ - if test "$withval" = "no"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - AC_DEFINE(ALLOW_BACKQUOTE_EXEC) - fi], [ - AC_MSG_RESULT(yes) - AC_DEFINE(ALLOW_BACKQUOTE_EXEC) -]) - -CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` -CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` -CFLAGS=${CFLAGS--O} -LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` -LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` -LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" +AST_X11_SUPPORT() +AST_IMLIB2_SUPPORT() +AST_MMX_SUPPORT() +AST_ARG_REGEXP(REGEXP) +AST_ARG_BACKQUOTE_EXEC(ALLOW_BACKQUOTE_EXEC) +AST_FLAGS() AC_SUBST(CC) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) @@ -213,25 +36,10 @@ AC_SUBST(LIBS) basedir=. - AM_CONFIG_HEADER(config.h) - AC_OUTPUT(${srcdir}/include/libast/types.h Makefile include/Makefile \ include/libast/Makefile src/Makefile test/Makefile \ libast-config) test -f libast-config && chmod 755 libast-config -echo " -$PACKAGE $VERSION -Configuration: --------------- - - Source code location: $srcdir - Host System Type: $host - Preprocessor: $CC $CPPFLAGS - Compiler: $CC $CFLAGS - Linker: $CC $LDFLAGS $LIBS - Install path: $prefix - - Now type 'make' to build $PACKAGE $VERSION. -" +AST_STATUS() =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/libast-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- libast-config.in 30 Oct 2000 22:02:42 -0000 1.1 +++ libast-config.in 5 Aug 2002 00:22:09 -0000 1.2 @@ -15,11 +15,12 @@ X11_SUPPORT=@LIBAST_X11_SUPPORT@ IMLIB2_SUPPORT=@LIBAST_IMLIB2_SUPPORT@ MMX_SUPPORT=@LIBAST_MMX_SUPPORT@ +REGEXP_SUPPORT=@LIBAST_REGEXP_SUPPORT@ VERSION=@VERSION@ case $1 in -h | --help | -help) - echo "Usage: libast-config [--version] [--prefix] [--exec-prefix] [--cppflags] [--ldflags]" + echo "Usage: libast-config [--version] [--prefix] [--exec-prefix] [--cppflags] [--ldflags] [--support]" ;; -v | --version | -version) echo "Libary of Assorted Spiffy Things: libast $VERSION" =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/libast.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- libast.spec 14 Jul 2002 03:31:37 -0000 1.2 +++ libast.spec 5 Aug 2002 00:22:09 -0000 1.3 @@ -25,9 +25,9 @@ %build if [ -e ./configure ] then - %configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} + %configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} --datadir=%{_datadir} else - ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} + ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} --datadir=%{_datadir} fi make @@ -47,3 +47,4 @@ %{_bindir}/* %{_libdir}/* %{_includedir}/* +%{_datadir}/* |