aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/guile.m420
-rw-r--r--m4/lib.m410
2 files changed, 15 insertions, 15 deletions
diff --git a/m4/guile.m4 b/m4/guile.m4
index bec442e..8a2f526 100644
--- a/m4/guile.m4
+++ b/m4/guile.m4
@@ -15,13 +15,13 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
-AC_DEFUN(rad_CHECK_GUILE,
+AC_DEFUN(RA_CHECK_GUILE,
[
- if test "x$rad_cv_lib_guile" = x; then
+ 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
- rad_cv_lib_guile=no
+ ra_cv_lib_guile=no
else
GUILE_INCLUDES=`guile-config compile`
GUILE_LIBS=`guile-config link`
@@ -29,12 +29,12 @@ AC_DEFUN(rad_CHECK_GUILE,
if test $GUILE_CONFIG != no; then
AC_MSG_CHECKING(for guile version 1.4 or higher)
- GV=`$GUILE_CONFIG --version 2>&1|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'`
+ GV=`($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$GV" in
x[[0-9]]*)
if test $GV -lt 14; then
AC_MSG_RESULT(Nope. Version number too low.)
- rad_cv_lib_guile=no
+ ra_cv_lib_guile=no
else
AC_MSG_RESULT(OK)
save_LIBS=$LIBS
@@ -44,13 +44,13 @@ AC_DEFUN(rad_CHECK_GUILE,
AC_TRY_LINK([#include <libguile.h>],
void main(argc, argv) int argc; char **argv;
{ ifelse([$1], , scm_shell(argc, argv);, [$1]) },
- [rad_cv_lib_guile=yes],
- [rad_cv_lib_guile=no])
+ [ra_cv_lib_guile=yes],
+ [ra_cv_lib_guile=no])
LIBS=$save_LIBS
CFLAGS=$save_CFLAGS
fi ;;
*) AC_MSG_RESULT(Nope. Unknown version number)
- rad_cv_lib_guile=no;;
+ ra_cv_lib_guile=no;;
esac
fi
else
@@ -59,8 +59,8 @@ AC_DEFUN(rad_CHECK_GUILE,
GUILE_LIBS=`guile-config link`
fi
AC_MSG_CHECKING(whether to build guile support)
- rad_RESULT_ACTIONS([rad_cv_lib_guile],[LIBGUILE],[$2],[$3])
- AC_MSG_RESULT(${cached}$rad_cv_lib_guile)
+ RA_RESULT_ACTIONS([ra_cv_lib_guile],[LIBGUILE],[$2],[$3])
+ AC_MSG_RESULT(${cached}$ra_cv_lib_guile)
])
diff --git a/m4/lib.m4 b/m4/lib.m4
index 684d6be..271a4c5 100644
--- a/m4/lib.m4
+++ b/m4/lib.m4
@@ -5,21 +5,21 @@ 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(rad_CHECK_LIB,
+AC_DEFUN(RA_CHECK_LIB,
[
save_LIBS=$LIBS
- AC_CACHE_CHECK([for -l$1], rad_cv_lib_$1,
+ AC_CACHE_CHECK([for -l$1], ra_cv_lib_$1,
[
for path in $6
do
LIBS="$save_LIBS -L$path"
AC_CHECK_LIB($1, $2,
- [rad_cv_lib_$1="$3 -L$path -l$1"
+ [ra_cv_lib_$1="$3 -L$path -l$1"
break],
- [rad_cv_lib_$1=no],$3)
+ [ra_cv_lib_$1=no],$3)
done
])
- rad_RESULT_ACTIONS([rad_cv_lib_$1],[LIB$1],[$4],[$5])
+ RA_RESULT_ACTIONS([ra_cv_lib_$1],[LIB$1],[$4],[$5])
LIBS=$save_LIBS
])

Return to:

Send suggestions and report system problems to the System administrator.