X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/b2208d2e987759270c712e35c8164394a47a52aa..a50eda40dfca0461d7ad6f013fa55d2c14f1d2c6:/acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 index f9603d97d..6a1470f24 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,7 +1,7 @@ dnl -*- Autoconf -*- dnl Copyright (C) 1997, 1999, 2000, 2001, 2002, 2004, 2006, -dnl 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +dnl 2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. dnl dnl This file is part of GUILE dnl @@ -462,13 +462,6 @@ AC_DEFUN([GUILE_READLINE], [ AC_CHECK_FUNCS([strdup]) AC_SUBST([READLINE_LIBS]) - - . $srcdir/guile-readline/LIBGUILEREADLINE-VERSION - AC_SUBST(LIBGUILEREADLINE_MAJOR) - AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT) - AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION) - AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE) - AC_SUBST(LIBGUILEREADLINE_INTERFACE) ]) dnl GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT @@ -583,41 +576,3 @@ AC_DEFUN([GUILE_CHECK_GUILE_FOR_BUILD], [ dnl Declare file $1 to be a script that needs configuring, dnl and arrange to make it executable in the process. AC_DEFUN([GUILE_CONFIG_SCRIPT],[AC_CONFIG_FILES([$1],[chmod +x $1])]) - - -dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Check for clock_gettime and clock_settime, and set LIB_CLOCK_GETTIME. -# For a program named, say foo, you should add a line like the following -# in the corresponding Makefile.am file: -# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) - -AC_DEFUN([gl_CLOCK_TIME], -[ - dnl Persuade glibc and Solaris to declare these functions. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - - # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. - # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - - # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* - # programs in the package would end up linked with that potentially-shared - # library, inducing unnecessary run-time overhead. - LIB_CLOCK_GETTIME= - AC_SUBST([LIB_CLOCK_GETTIME]) - gl_saved_libs=$LIBS - AC_SEARCH_LIBS([clock_gettime], [rt posix4], - [if test "$ac_cv_search_clock_gettime" = "none required"; then - AC_SEARCH_LIBS([clock_getcpuclockid], [rt posix4], - [test "$ac_cv_search_clock_getcpuclockid" = "none required" \ - || LIB_CLOCK_GETTIME=$ac_cv_search_clock_getcpuclockid], - [LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) - else - LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime - fi]) - AC_CHECK_FUNCS([clock_gettime clock_settime clock_getcpuclockid]) - LIBS=$gl_saved_libs -])