From: <cli...@li...> - 2008-05-29 19:06:52
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.6228,1.6229 (Sam Steingold) 2. clisp/src/m4 general.m4,1.19,1.20 (Sam Steingold) 3. clisp/modules/clx/new-clx configure.in,1.16,1.17 (Sam Steingold) 4. clisp/src ChangeLog,1.6229,1.6230 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Thu, 29 May 2008 17:44:29 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6228,1.6229 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11730/src Modified Files: ChangeLog Log Message: (CL_CHECK): extracted from ... (CL_COMPILE_CHECK, CL_LINK_CHECK): use it Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6228 retrieving revision 1.6229 diff -u -d -r1.6228 -r1.6229 --- ChangeLog 29 May 2008 15:51:20 -0000 1.6228 +++ ChangeLog 29 May 2008 17:44:26 -0000 1.6229 @@ -1,5 +1,10 @@ 2008-05-29 Sam Steingold <sd...@gn...> + * m4/general.m4 (CL_CHECK): extracted from ... + (CL_COMPILE_CHECK, CL_LINK_CHECK): use it + +2008-05-29 Sam Steingold <sd...@gn...> + * modules/clx/new-clx/configure.in: add proper quoting; use AC_LINK_IFELSE instead of AC_TRY_LINK ------------------------------ Message: 2 Date: Thu, 29 May 2008 17:44:30 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src/m4 general.m4,1.19,1.20 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src/m4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11730/src/m4 Modified Files: general.m4 Log Message: (CL_CHECK): extracted from ... (CL_COMPILE_CHECK, CL_LINK_CHECK): use it Index: general.m4 =================================================================== RCS file: /cvsroot/clisp/clisp/src/m4/general.m4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- general.m4 28 May 2008 21:54:18 -0000 1.19 +++ general.m4 29 May 2008 17:44:27 -0000 1.20 @@ -10,13 +10,11 @@ AC_PREREQ(2.61) dnl without AC_MSG_...: with AC_MSG_... and caching: -dnl AC_TRY_COMPILE CL_COMPILE_CHECK -dnl AC_TRY_LINK CL_LINK_CHECK +dnl AC_COMPILE_IFELSE CL_COMPILE_CHECK +dnl AC_LINK_IFELSE CL_LINK_CHECK dnl Usage: -dnl AC_TRY_xxx(INCLUDES, FUNCTION-BODY, -dnl ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -dnl CL_xxx_CHECK(ECHO-TEXT, CACHE-ID, -dnl INCLUDES, FUNCTION-BODY, +dnl AC_xxx_IFELSE(PROGRAM, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) +dnl CL_xxx_CHECK(ECHO-TEXT, CACHE-ID, PROGRAM, dnl ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) dnl 3 next macros avoid aclocal warnings about wrong macro order @@ -47,33 +45,14 @@ AC_REQUIRE([CL_CODEEXEC])dnl ]) -AC_DEFUN([CL_COMPILE_CHECK], -[AC_MSG_CHECKING(for $1) -AC_CACHE_VAL($2,[ -AC_TRY_COMPILE([$3],[$4], $2=yes, $2=no) -]) -AC_MSG_RESULT([$]$2) -if test [$]$2 = yes; then - ifelse([$5], , :, [$5]) -ifelse([$6], , , [else - $6 -])dnl -fi +AC_DEFUN([CL_CHECK],[dnl + AC_CACHE_CHECK([for $2],[$3], + [$1([AC_LANG_PROGRAM([$4],[$5])],[$3=yes],[$3=no])]) + AS_IF([test $$3 = yes], [$6], [$7]) ]) -AC_DEFUN([CL_LINK_CHECK], -[AC_MSG_CHECKING(for $1) -AC_CACHE_VAL($2,[ -AC_TRY_LINK([$3],[$4], $2=yes, $2=no) -]) -AC_MSG_RESULT([$]$2) -if test [$]$2 = yes; then - ifelse([$5], , :, [$5]) -ifelse([$6], , , [else - $6 -])dnl -fi -]) +AC_DEFUN([CL_COMPILE_CHECK], [CL_CHECK([AC_COMPILE_IFELSE],$@)]) +AC_DEFUN([CL_LINK_CHECK], [CL_CHECK([AC_LINK_IFELSE],$@)]) dnl Expands to the "extern ..." prefix used for system declarations. dnl AC_LANG_EXTERN() ------------------------------ Message: 3 Date: Thu, 29 May 2008 19:03:36 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/clx/new-clx configure.in,1.16,1.17 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/modules/clx/new-clx In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9166/modules/clx/new-clx Modified Files: configure.in Log Message: use m4_define to avoid writing the same program twice Index: configure.in =================================================================== RCS file: /cvsroot/clisp/clisp/modules/clx/new-clx/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure.in 29 May 2008 15:51:20 -0000 1.16 +++ configure.in 29 May 2008 19:03:34 -0000 1.17 @@ -27,7 +27,7 @@ LIBS="$X_LIBS $X_PRE_LIBS -lX11 $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/Xlib.h>], - [XGetAtomNames(0,0,0,0);])], + [XGetAtomNames(0,0,0,0)])], [cl_cv_have_XGetAtomNames=yes], [cl_cv_have_XGetAtomNames=no]) LIBS=$cl_LIBS_save CFLAGS=$cl_CFLAGS_save]) @@ -42,7 +42,7 @@ LIBS="$X_LIBS -lXpm $X_PRE_LIBS -lX11 $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/xpm.h>], - [XpmReadFileToPixmap(0,0,0,0,0,0);])], + [XpmReadFileToPixmap(0,0,0,0,0,0)])], [cl_cv_have_xpm=yes], [cl_cv_have_xpm=no]) LIBS=$cl_LIBS_save CFLAGS=$cl_CFLAGS_save]) @@ -55,29 +55,28 @@ CFLAGS="$CFLAGS $X_CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/Xlib.h> #include <X11/Xutil.h> -#include <X11/extensions/shape.h>],[XShapeQueryExtension(0,0,0);])], +#include <X11/extensions/shape.h>],[XShapeQueryExtension(0,0,0)])], [cl_cv_have_xshape=yes], [cl_cv_have_xshape=no]) LIBS=$cl_LIBS_save CFLAGS=$cl_CFLAGS_save]) +m4_define([CL_PROGRAM_XauGetAuthByAddr], +[AC_LANG_PROGRAM([#include <sys/socket.h> +#include <X11/Xlib.h> +#include <X11/Xauth.h>], +[XauGetAuthByAddr(AF_INET,0,"",13,"localhost:0.0",13,"localhost:0.0")])]) + AC_CACHE_CHECK([if XauGetAuthByAddr needs -lXau], [cl_cv_need_lXau], [ cl_LIBS_save=$LIBS cl_CFLAGS_save=$CFLAGS LIBS="$X_LIBS $X_PRE_LIBS -lX11 $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/socket.h> -#include <X11/Xlib.h> -#include <X11/Xauth.h>], -[XauGetAuthByAddr(AF_INET,0,"",13,"localhost:0.0",13,"localhost:0.0");])], + AC_LINK_IFELSE([CL_PROGRAM_XauGetAuthByAddr], [cl_cv_need_lXau=no], [cl_cv_need_lXau=maybe]) if test $cl_cv_need_lXau = maybe; then LIBS="$X_LIBS -lXau $X_PRE_LIBS $LIBS" CFLAGS="$CFLAGS $X_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/socket.h> -#include <X11/Xlib.h> -#include <X11/Xauth.h>], -[XauGetAuthByAddr(AF_INET,0,"",13,"localhost:0.0",13,"localhost:0.0");])], - [cl_cv_need_lXau=yes], + AC_LINK_IFELSE([CL_PROGRAM_XauGetAuthByAddr],[cl_cv_need_lXau=yes], AC_MSG_FAILURE([XauGetAuthByAddr was not found])) fi LIBS=$cl_LIBS_save ------------------------------ Message: 4 Date: Thu, 29 May 2008 19:03:38 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6229,1.6230 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9166/src Modified Files: ChangeLog Log Message: use m4_define to avoid writing the same program twice Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6229 retrieving revision 1.6230 diff -u -d -r1.6229 -r1.6230 --- ChangeLog 29 May 2008 17:44:26 -0000 1.6229 +++ ChangeLog 29 May 2008 19:03:34 -0000 1.6230 @@ -6,7 +6,8 @@ 2008-05-29 Sam Steingold <sd...@gn...> * modules/clx/new-clx/configure.in: add proper quoting; - use AC_LINK_IFELSE instead of AC_TRY_LINK + use AC_LINK_IFELSE instead of AC_TRY_LINK; + use m4_define to avoid writing the same program twice 2008-05-29 Sam Steingold <sd...@gn...> ------------------------------ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 25, Issue 55 ***************************************** |