diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-12-17 12:54:12 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-12-17 12:54:12 +0200 |
commit | 6d8e4937c42ed90fc650385d61fd23b8b6755cec (patch) | |
tree | 08339ca7cc12b8bc02f9996daf93c657e3e1fd65 | |
parent | 069035d5cf7ad522835f6ae31a6fd25caa25d8b9 (diff) | |
download | radius-6d8e4937c42ed90fc650385d61fd23b8b6755cec.tar.gz radius-6d8e4937c42ed90fc650385d61fd23b8b6755cec.tar.bz2 |
Minor changes.
* am/guile.m4: Remove useless checks for functions.
* configure.ac: Minor changes.
* lib/users.l, radtest/input.l: Refer to current buffer
through YY_CURRENT_BUFFER.
* m4/*: Remove.
-rw-r--r-- | am/guile.m4 | 25 | ||||
-rw-r--r-- | configure.ac | 96 | ||||
-rw-r--r-- | lib/users.l | 2 | ||||
-rw-r--r-- | m4/.cvsignore | 105 | ||||
-rw-r--r-- | m4/common.m4 | 49 | ||||
-rw-r--r-- | m4/guile.m4 | 90 | ||||
-rw-r--r-- | m4/inaddr.m4 | 40 | ||||
-rw-r--r-- | m4/ld.m4 | 39 | ||||
-rw-r--r-- | m4/lib.m4 | 26 | ||||
-rw-r--r-- | m4/maintain.m4 | 32 | ||||
-rw-r--r-- | radtest/input.l | 2 |
11 files changed, 49 insertions, 457 deletions
diff --git a/am/guile.m4 b/am/guile.m4 index f3db7266..a4a80476 100644 --- a/am/guile.m4 +++ b/am/guile.m4 @@ -1,5 +1,5 @@ dnl This file is part of GNU Radius. -dnl Copyright (C) 2001,2003,2007 Free Software Foundation, Inc. +dnl Copyright (C) 2001,2003,2007,2008 Free Software Foundation, Inc. dnl dnl Written by Sergey Poznyakoff dnl @@ -33,8 +33,8 @@ AC_DEFUN([RA_CHECK_GUILE], if test $GUILE_CONFIG != no; then AC_MSG_CHECKING(for guile version 1.8 or higher) GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'` - case "x$GUILE_VERSION" in - x[[0-9]]*) + case "$GUILE_VERSION" in + [[0-9]]*) if test $GUILE_VERSION -lt 18; then AC_MSG_RESULT(Nope. Need at least version 1.8.0) ra_cv_lib_guile=no @@ -65,25 +65,6 @@ AC_DEFUN([RA_CHECK_GUILE], AC_MSG_CHECKING(whether to build guile support) RA_RESULT_ACTIONS([ra_cv_lib_guile],[LIBGUILE],[$2],[$3]) AC_MSG_RESULT(${cached}$ra_cv_lib_guile) - if test $ra_cv_lib_guile = yes; then - if test $GUILE_VERSION -gt 14; then - LIBS="$LIBS $GUILE_LIBS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - AC_CHECK_FUNCS(scm_long2num scm_cell scm_list_1 scm_list_n scm_c_define\ - scm_c_lookup) - if test $ac_cv_func_scm_cell = no; then - AC_MSG_CHECKING(for inline scm_cell) - AC_TRY_LINK([#include <libguile.h>], - [scm_cell(SCM_EOL, SCM_EOL)], - [ac_cv_func_scm_cell=yes - AC_DEFINE(HAVE_SCM_CELL,1, - Define if you have scm_cell function)]) - AC_MSG_RESULT($ac_cv_func_scm_cell) - fi - CFLAGS=$save_CFLAGS - LIBS=$save_LIBS - fi - fi ]) diff --git a/configure.ac b/configure.ac index 2691c9a4..8b496a39 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # along with GNU Radius; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -AC_PREREQ(2.59) +AC_PREREQ(2.61) AC_REVISION($Revision$) AC_INIT([GNU Radius], [1.6.1], [bug-gnu-radius@gnu.org]) @@ -244,15 +244,9 @@ case $LEAK_DETECTOR in esac AH_BOTTOM([ -/*FIXME*/ -#if defined(sun) && !defined(__EXTENSIONS__) -# define __EXTENSIONS__ -#endif - #ifdef MAINTAINER_MODE # define LEAK_DETECTOR 1 #endif - ]) ## * Checks for typedefs, structures, and compiler characteristics. @@ -371,7 +365,7 @@ esac],[usereadline=yes]) dnl Check for GNU Readline AC_SUBST(READLINE_LIBS) -if test x"$usereadline" = x"yes"; then +if test "$usereadline" = "yes"; then dnl FIXME This should only link in the curses libraries if it's dnl really needed! @@ -388,7 +382,7 @@ if test x"$usereadline" = x"yes"; then AC_CHECK_LIB(readline, readline, ra_have_readline=yes) LIBS=$saved_LIBS - if test x"$ra_have_readline" = x"yes"; then + if test "$ra_have_readline" = "yes"; then AC_CHECK_HEADERS(readline/readline.h, AC_DEFINE(WITH_READLINE,1,[Enable use of readline])) READLINE_LIBS="-lreadline $CURSES_LIBS" @@ -433,8 +427,8 @@ AC_MSG_CHECKING(for log directory path) AC_ARG_WITH(log-dir, AC_HELP_STRING([--with-log-dir=PATH], [Use PATH instead of default log directory path]), - [case "x$withval" in - x/*) RADLOG_DIR=$withval;; + [case "$withval" in + /*) RADLOG_DIR=$withval;; *) AC_MSG_ERROR(Argument must be an absolute pathname);; esac], [if test -d /var/log; then @@ -453,8 +447,8 @@ AC_MSG_CHECKING(for pidfile directory path) AC_ARG_WITH(pid-dir, AC_HELP_STRING([--with-pid-dir=PATH], [Use PATH instead of default podfile location]), - [case "x$withval" in - x/*) RADPID_DIR=$withval;; + [case "$withval" in + /*) RADPID_DIR=$withval;; *) AC_MSG_ERROR(Argument must be an absolute pathname);; esac], [if test -d /var/run; then @@ -472,9 +466,9 @@ PATHFLAGS='-DSYSCONFDIR=\"$(sysconfdir)\" -DRADPID_DIR=\"$(RADPID_DIR)\" -DRADLO AC_DEFINE_UNQUOTED(BUILD_TARGET, "$target", [Target the package is built for]) -## *************** +## ****************** ## server vs. client -## *************** +## ****************** AC_MSG_CHECKING(whether to build radius daemon) AC_ARG_ENABLE(server, AC_HELP_STRING([--disable-server], @@ -599,14 +593,13 @@ AC_ARG_ENABLE(pam, AC_HELP_STRING([--enable-pam], [enable pam support]), [case $enableval in - yes) USE_PAM=yes - AC_DEFINE(USE_PAM,1, - [Enable PAM support]);; - no) ;; - *) AC_MSG_ERROR(--enable-pam can't be used with an argument) - exit 1;; + yes) USE_PAM=yes + AC_DEFINE(USE_PAM,1,[Enable PAM support]);; + no) ;; + *) AC_MSG_ERROR([--enable-pam can't be used with an argument]) + exit 1;; esac]) -if test x$USE_PAM = xyes; then +if test "$USE_PAM" = yes; then AC_CHECK_LIB(pam, pam_start, [ AC_DEFINE(HAVE_LIBPAM,1,[Define if you have libpam]) RA_RADIUSD_LDADD(-lpam) ], @@ -648,18 +641,18 @@ AC_ARG_ENABLE(dbm, AC_HELP_STRING([--enable-dbm[={dbm|ndbm}]], [include dbm support]), [case $enableval in - yes) rad_lib_ndbm - AC_DEFINE_UNQUOTED(USE_DBM,DBM_NDBM);; + yes) rad_lib_ndbm + AC_DEFINE_UNQUOTED(USE_DBM,DBM_NDBM);; - no) USE_DBM=no;; + no) USE_DBM=no;; - DBM|dbm) rad_lib_dbm - AC_DEFINE_UNQUOTED(USE_DBM,DBM_DBM);; + DBM|dbm) rad_lib_dbm + AC_DEFINE_UNQUOTED(USE_DBM,DBM_DBM);; - NDBM|ndbm) rad_lib_ndbm - AC_DEFINE_UNQUOTED(USE_DBM,DBM_NDBM);; + NDBM|ndbm) rad_lib_ndbm + AC_DEFINE_UNQUOTED(USE_DBM,DBM_NDBM);; - *) AC_MSG_ERROR(unsupported option value: $enableval) + *) AC_MSG_ERROR(unsupported option value: $enableval) esac]) @@ -862,19 +855,19 @@ AC_ARG_ENABLE(snmp, AC_HELP_STRING([--enable-snmp[={yes|no|compat}]], [enable SNMP support]), [case $enableval in - compat) USE_SNMP=yes - AC_DEFINE(USE_SNMP) - AC_DEFINE(SNMP_COMPAT_0_96,1, - [Enable support for MIBS used in 0.96 branch]) - SNMP_CONFIG="" - ;; - yes) USE_SNMP=yes - AC_DEFINE(USE_SNMP) - SNMP_CONFIG="" - ;; - no) ;; - *) AC_MSG_ERROR(--enable-snmp can't be used with an argument) - exit 1;; + compat) USE_SNMP=yes + AC_DEFINE(USE_SNMP) + AC_DEFINE(SNMP_COMPAT_0_96,1, + [Enable support for MIBS used in 0.96 branch]) + SNMP_CONFIG="" + ;; + yes) USE_SNMP=yes + AC_DEFINE(USE_SNMP) + SNMP_CONFIG="" + ;; + no) ;; + *) AC_MSG_ERROR(--enable-snmp can't be used with an argument) + exit 1;; esac]) AH_BOTTOM([ @@ -901,10 +894,10 @@ AC_ARG_ENABLE(livingston-menus, [enable Livingston-compatible menus]), [USE_LIVINGSTON_MENUS=$enableval case $enableval in - yes) AC_DEFINE(USE_LIVINGSTON_MENUS,1, - [Enable support for Livingstone menus]);; - *) ;; - esac]) + yes) AC_DEFINE(USE_LIVINGSTON_MENUS,1, + [Enable support for Livingstone menus]);; + *) ;; + esac]) AH_TEMPLATE(DENY_SHELL, [When defined, users with the given shell will be always denied @@ -914,11 +907,10 @@ AC_ARG_ENABLE(deny_shell, [always reject users with given shell]), [USE_DENY_SHELL=$enableval case $enableval in - yes|no) AC_MSG_ERROR(--enable-deny-shell requires an argument) - exit 1;; - "*") AC_DEFINE_UNQUOTED(DENY_SHELL, $enableval);; - *) AC_DEFINE_UNQUOTED(DENY_SHELL, "$enableval");; - esac]) + yes|no) AC_MSG_ERROR([--enable-deny-shell requires an argument]) + exit 1;; + *) AC_DEFINE_UNQUOTED(DENY_SHELL, "$enableval");; + esac]) ## *********************************************************************** ## * Do some final checks and create Makefiles * diff --git a/lib/users.l b/lib/users.l index 2206e561..3015438a 100644 --- a/lib/users.l +++ b/lib/users.l @@ -457,7 +457,7 @@ grad_parser_lex_finish() { grad_slist_free(&slist); #ifdef FLEX_SCANNER - yy_delete_buffer(yy_current_buffer); + yy_delete_buffer(YY_CURRENT_BUFFER); #endif yyin = NULL; } diff --git a/m4/.cvsignore b/m4/.cvsignore deleted file mode 100644 index a4ae0567..00000000 --- a/m4/.cvsignore +++ /dev/null @@ -1,105 +0,0 @@ -Makefile -Makefile.in -Makevars.template -absolute-header.m4 -alloca.m4 -argp.m4 -codeset.m4 -dirname.m4 -dos.m4 -double-slash-root.m4 -eoverflow.m4 -errno_h.m4 -error.m4 -exitfail.m4 -extensions.m4 -float_h.m4 -getdelim.m4 -getline.m4 -getopt.m4 -gettext.m4 -glibc2.m4 -glibc21.m4 -gnulib-cache.m4 -gnulib-common.m4 -gnulib-comp.m4 -gnulib-tool.m4 -iconv.m4 -include_next.m4 -inline.m4 -intdiv0.m4 -intl.m4 -intldir.m4 -intlmacosx.m4 -intmax.m4 -intmax_t.m4 -inttypes-h.m4 -inttypes-pri.m4 -inttypes.m4 -inttypes_h.m4 -isc-posix.m4 -lcmessage.m4 -ld.m4 -lib-ld.m4 -lib-link.m4 -lib-prefix.m4 -libtool.m4 -localcharset.m4 -lock.m4 -longdouble.m4 -longlong.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4 -malloc.m4 -mbchar.m4 -mbiter.m4 -mbrtowc.m4 -mbstate_t.m4 -memchr.m4 -mempcpy.m4 -minmax.m4 -nls.m4 -onceonly.m4 -onceonly_2_57.m4 -po.m4 -printf-posix.m4 -printf.m4 -progtest.m4 -rawmemchr.m4 -realloc.m4 -regex.m4 -signed.m4 -size_max.m4 -sleep.m4 -ssize_t.m4 -stdbool.m4 -stdint.m4 -stdint_h.m4 -stdio_h.m4 -stdlib_h.m4 -strcase.m4 -strchrnul.m4 -strerror.m4 -string_h.m4 -strings_h.m4 -strndup.m4 -strnlen.m4 -sysexits.m4 -threadlib.m4 -uintmax_t.m4 -ulonglong.m4 -unistd_h.m4 -vasnprintf.m4 -vasprintf.m4 -visibility.m4 -vsnprintf.m4 -wchar.m4 -wchar_t.m4 -wctype.m4 -wcwidth.m4 -wint_t.m4 -xalloc.m4 -xsize.m4 -xstrndup.m4 diff --git a/m4/common.m4 b/m4/common.m4 deleted file mode 100644 index 395a7cbd..00000000 --- a/m4/common.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl RA_FLUSHLEFT -- remove all whitespace at the beginning of lines -dnl This is useful for c-code which may include cpp statements -dnl -define([RA_FLUSHLEFT], - [changequote(`,')dnl -patsubst(`$1', `^[ ]+') -changequote([,])])dnl - -dnl RA_RESULT_ACTIONS -- generate shell code for the result of a test -dnl $1 -- CVAR -- cache variable to check -dnl $2 -- NAME -- if not empty, used to generate a default value TRUE: -dnl `AC_DEFINE(HAVE_NAME)' -dnl $2 -- TRUE -- what to do if the CVAR is not `no' -dnl $3 -- FALSE -- what to do otherwise; defaults to `:' -dnl -AC_DEFUN([RA_RESULT_ACTIONS], [ -[if test "$$1" != "" -a "$$1" != no; then - ]ifelse([$3], , - [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[,1,[FIXME])], - [$3])[ -else - ]ifelse([$4], , [:], [$4])[ -fi]])dnl - -dnl RA_CHECK_STRUCT_FIELD -- See if a structure has a particular field -dnl $1 - NAME -- name of structure -dnl $2 - FIELD -- name of field to test -dnl $3 - INCLS -- C program text to inculde necessary files for testing -dnl $4 - TRUE -- what to do if struct NAME has FIELD; defaults to -dnl `AC_DEFINE(HAVE_NAME_FIELD)' -dnl $5 - FALSE -- what to do if not; defaults to `:' -dnl -dnl NOTE: We still don't use AC_CHECK_MEMBERS, since it has (as of -dnl autoconf 2.53) a bug which prevents it from recognizing members -dnl of aggregate type. - -AC_DEFUN([RA_CHECK_STRUCT_FIELD], [ - define([ra_CVAR], [ra_cv_struct_]translit($1_$2, [A-Z], [a-z]))dnl - AC_CACHE_CHECK([whether struct $1 has $2 field], ra_CVAR, - AC_TRY_COMPILE(RA_FLUSHLEFT([$3]), - [struct $1 ra_x; int ra_y = sizeof ra_x.$2;], - ra_CVAR[=yes], ra_CVAR[=no])) - RA_RESULT_ACTIONS(ra_CVAR, [$1_$2], [$4], [$5])dnl - undefine([ra_CVAR])])dnl - -AC_SUBST(RADIUSD_LDADD_LIST) -AC_DEFUN([RA_RADIUSD_LDADD], - RADIUSD_LDADD_LIST="$RADIUSD_LDADD_LIST [$1]") - diff --git a/m4/guile.m4 b/m4/guile.m4 deleted file mode 100644 index f3db7266..00000000 --- a/m4/guile.m4 +++ /dev/null @@ -1,90 +0,0 @@ -dnl This file is part of GNU Radius. -dnl Copyright (C) 2001,2003,2007 Free Software Foundation, Inc. -dnl -dnl Written by Sergey Poznyakoff -dnl -dnl GNU Radius is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl GNU Radius is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with GNU Radius; if not, write to the Free Software Foundation, -dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl - -AC_DEFUN([RA_CHECK_GUILE], -[ - if test "x$ra_cv_lib_guile" = x; then - cached="" - AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH) - if test $GUILE_CONFIG = no; then - ra_cv_lib_guile=no - else - GUILE_INCLUDES=`guile-config compile` - GUILE_LIBS=`guile-config link` - fi - - if test $GUILE_CONFIG != no; then - AC_MSG_CHECKING(for guile version 1.8 or higher) - GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'` - case "x$GUILE_VERSION" in - x[[0-9]]*) - if test $GUILE_VERSION -lt 18; then - AC_MSG_RESULT(Nope. Need at least version 1.8.0) - ra_cv_lib_guile=no - else - AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION, - [Guile version number: MAX*10 + MIN]) - AC_MSG_RESULT(OK) - save_LIBS=$LIBS - save_CFLAGS=$CFLAGS - LIBS="$LIBS $GUILE_LIBS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - AC_TRY_LINK([#include <libguile.h>], - ifelse([$1], , scm_shell(0, NULL);, [$1]), - [ra_cv_lib_guile=yes], - [ra_cv_lib_guile=no]) - LIBS=$save_LIBS - CFLAGS=$save_CFLAGS - fi ;; - *) AC_MSG_RESULT(Nope. Unknown version number) - ra_cv_lib_guile=no;; - esac - fi - else - cached=" (cached) " - GUILE_INCLUDES=`guile-config compile` - GUILE_LIBS=`guile-config link` - fi - AC_MSG_CHECKING(whether to build guile support) - RA_RESULT_ACTIONS([ra_cv_lib_guile],[LIBGUILE],[$2],[$3]) - AC_MSG_RESULT(${cached}$ra_cv_lib_guile) - if test $ra_cv_lib_guile = yes; then - if test $GUILE_VERSION -gt 14; then - LIBS="$LIBS $GUILE_LIBS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - AC_CHECK_FUNCS(scm_long2num scm_cell scm_list_1 scm_list_n scm_c_define\ - scm_c_lookup) - if test $ac_cv_func_scm_cell = no; then - AC_MSG_CHECKING(for inline scm_cell) - AC_TRY_LINK([#include <libguile.h>], - [scm_cell(SCM_EOL, SCM_EOL)], - [ac_cv_func_scm_cell=yes - AC_DEFINE(HAVE_SCM_CELL,1, - Define if you have scm_cell function)]) - AC_MSG_RESULT($ac_cv_func_scm_cell) - fi - CFLAGS=$save_CFLAGS - LIBS=$save_LIBS - fi - fi -]) - - - diff --git a/m4/inaddr.m4 b/m4/inaddr.m4 deleted file mode 100644 index f734fd7a..00000000 --- a/m4/inaddr.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl This file is part of GNU Radius. -dnl Copyright (C) 2001,2003,2007 Free Software Foundation, Inc. -dnl -dnl Written by Sergey Poznyakoff -dnl -dnl GNU Radius is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl GNU Radius is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with GNU Radius; if not, write to the Free Software Foundation, -dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl -AC_DEFUN([RA_CHECK_INADDR_LOOPBACK], - [ - AC_MSG_CHECKING(for INADDR_LOOPBACK) - AC_CACHE_VAL(ra_cv_decl_inaddrloopback,[ - AC_TRY_COMPILE([ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> - ],[ - INADDR_LOOPBACK; - ], - ra_cv_decl_inaddrloopback=yes, - ra_cv_decl_inaddrloopback=no)]) - if test "$ra_cv_decl_inaddrloopback" = yes; then - AC_MSG_RESULT(found) - else - AC_MSG_RESULT([no]) - AC_DEFINE_UNQUOTED(INADDR_LOOPBACK,0x7f000001, - [System headers should have defined this]) - fi]) diff --git a/m4/ld.m4 b/m4/ld.m4 deleted file mode 100644 index 3e913eb0..00000000 --- a/m4/ld.m4 +++ /dev/null @@ -1,39 +0,0 @@ -AC_DEFUN([RA_LD_VERSIONING], - [AC_CACHE_CHECK([for ld --version-script], - [ra_cv_ld_version_script_option], [dnl - - cat > conftest.c <<EOF -int foo() -{ - return 0; -} -EOF - - cat > conftest.map <<EOF -VERS_1 { - global: foo; -}; - -VERS_2 { - global: foo; -} VERS_1; -EOF - if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared - -o conftest.so conftest.c - -nostartfiles -nostdlib - -Wl,--version-script,conftest.map]) - then - ra_cv_ld_version_script_option=yes - else - ra_cv_ld_version_script_option=no - fi - rm -f conftest*]) - AC_SUBST(VERSION_SCRIPT_OPTION) - if test "$ra_cv_ld_version_script_option" = yes; then - VERSION_SCRIPT_OPTION='-Wl,--version-script=$(VERSION_SCRIPT)' - else - VERSION_SCRIPT_OPTION= - fi]) - - - diff --git a/m4/lib.m4 b/m4/lib.m4 deleted file mode 100644 index 1ecb33ca..00000000 --- a/m4/lib.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl Arguments: -dnl $1 -- Library to look for -dnl $2 -- Function to check in the library -dnl $3 -- Any additional libraries that might be needed -dnl $4 -- Action to be taken when test succeeds -dnl $5 -- Action to be taken when test fails -dnl $6 -- Directories where the library may reside -AC_DEFUN([RA_CHECK_LIB], -[ - save_LIBS=$LIBS - AC_CACHE_CHECK([for -l$1], ra_cv_lib_$1, - [ - for path in $6 - do - LIBS="$save_LIBS $3 -L$path -l$1" - AC_TRY_LINK_FUNC($2, - [ra_cv_lib_$1="$3 -L$path -l$1" - break], - [ra_cv_lib_$1=no],$3) - done - ]) - RA_RESULT_ACTIONS([ra_cv_lib_$1],[LIB$1],[$4],[$5]) - LIBS=$save_LIBS -]) - - diff --git a/m4/maintain.m4 b/m4/maintain.m4 deleted file mode 100644 index ee41820b..00000000 --- a/m4/maintain.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl This file is part of GNU mailutils. -dnl Copyright (C) 2001 Free Software Foundation, Inc. -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -dnl -dnl Check for --enable-maintainer-mode and enable maintainer-specific -dnl settings. - -AC_DEFUN([RA_MAINTAINER_MODE], - [AM_MAINTAINER_MODE - if test x"$USE_MAINTAINER_MODE" = xyes; then - if test x"$GCC" = xyes; then - AC_MSG_CHECKING(whether gcc accepts -ggdb) - CFLAGS="-ggdb" - AC_TRY_COMPILE([],void f(){}, - AC_MSG_RESULT(yes), - [if test x"$ac_cv_prog_cc_g" = xyes; then - CFLAGS=-g - else - CFLAGS= - fi - AC_MSG_RESULT(no)]) - CFLAGS="$CFLAGS -DMAINTAINER_MODE" - fi - $1 - fi]) diff --git a/radtest/input.l b/radtest/input.l index 6c1483cd..e295f003 100644 --- a/radtest/input.l +++ b/radtest/input.l @@ -489,7 +489,7 @@ void close_input() { #ifdef FLEX_SCANNER - yy_delete_buffer(yy_current_buffer); + yy_delete_buffer(YY_CURRENT_BUFFER); #endif fclose(yyin); yyin = NULL; |