sm_lib_safe=`echo "$1" | sed 'y%./+-%__p_%'`
sm_func_safe=`echo "$2" | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING([for $2 in -l$1])
old_LIBS="$LIBS"
smart_lib=
dnl #
if test "x$smart_try_dir" != "x"; then
for try in $smart_try_dir; do
- LIBS="-L$try -l$1 $old_LIBS"
+ AC_MSG_CHECKING([for $2 in -l$1 in $try])
+ LIBS="-L$try -l$1 $old_LIBS -Wl,-rpath,$try"
AC_TRY_LINK([extern char $2();],
- [ $2()],
- smart_lib="-L$try -l$1")
- if test "x$smart_lib" != "x"; then
- break;
- fi
+ [$2()],
+ [
+ smart_lib="-L$try -l$1 -Wl,-rpath,$try"
+ AC_MSG_RESULT(yes)
+ break
+ ],
+ [AC_MSG_RESULT(no)])
done
LIBS="$old_LIBS"
fi
dnl # Try using the default library path
dnl #
if test "x$smart_lib" = "x"; then
+ AC_MSG_CHECKING([for $2 in -l$1])
LIBS="-l$1 $old_LIBS"
AC_TRY_LINK([extern char $2();],
- [ $2()],
- smart_lib="-l$1")
+ [$2()],
+ [
+ smart_lib="-l$1"
+ AC_MSG_RESULT(yes)
+ ],
+ [AC_MSG_RESULT(no)])
LIBS="$old_LIBS"
fi
FR_LOCATE_DIR(smart_lib_dir,[lib$1.a])
for try in $smart_lib_dir /usr/local/lib /opt/lib; do
- LIBS="-L$try -l$1 $old_LIBS"
+ AC_MSG_CHECKING([for $2 in -l$1 in $try])
+ LIBS="-L$try -rpath$try -l$1 $old_LIBS -Wl,-rpath,$try"
AC_TRY_LINK([extern char $2();],
- [ $2()],
- smart_lib="-L$try -l$1")
- if test "x$smart_lib" != "x"; then
- break;
- fi
+ [$2()],
+ [
+ smart_lib="-L$try -l$1 -Wl,-rpath,$try"
+ AC_MSG_RESULT(yes)
+ break
+ ],
+ [AC_MSG_RESULT(no)])
done
LIBS="$old_LIBS"
fi
dnl # Found it, set the appropriate variable.
dnl #
if test "x$smart_lib" != "x"; then
- AC_MSG_RESULT(yes)
eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
LIBS="$smart_lib $old_LIBS"
SMART_LIBS="$smart_lib $SMART_LIBS"
-else
- AC_MSG_RESULT(no)
fi
])
AC_DEFUN([FR_SMART_CHECK_INCLUDE], [
ac_safe=`echo "$1" | sed 'y%./+-%__pm%'`
-AC_MSG_CHECKING([for $1])
-
old_CFLAGS="$CFLAGS"
smart_include=
smart_include_dir=
dnl #
if test "x$smart_try_dir" != "x"; then
for try in $smart_try_dir; do
+ AC_MSG_CHECKING([for $1 in $try])
CFLAGS="$old_CFLAGS -I$try"
AC_TRY_COMPILE([$2
#include <$1>],
- [ int a = 1;],
- smart_include="-I$try",
- smart_include=)
- if test "x$smart_include" != "x"; then
- break;
- fi
+ [int a = 1;],
+ [
+ smart_include="-I$try"
+ AC_MSG_RESULT(yes)
+ break
+ ],
+ [
+ smart_include=
+ AC_MSG_RESULT(no)
+ ])
done
CFLAGS="$old_CFLAGS"
fi
dnl # Try using the default includes.
dnl #
if test "x$smart_include" = "x"; then
+ AC_MSG_CHECKING([for $1])
AC_TRY_COMPILE([$2
#include <$1>],
- [ int a = 1;],
- smart_include=" ",
- smart_include=)
+ [int a = 1;],
+ [
+ smart_include=" "
+ AC_MSG_RESULT(yes)
+ break
+ ],
+ [
+ smart_include=
+ AC_MSG_RESULT(no)
+ ])
fi
dnl #
dnl #
if test "x$smart_include" = "x"; then
FR_LOCATE_DIR(smart_include_dir,$1)
-
for try in $smart_include_dir /usr/local/include /opt/include; do
+ AC_MSG_CHECKING([for $1 in $try])
CFLAGS="$old_CFLAGS -I$try"
AC_TRY_COMPILE([$2
#include <$1>],
- [ int a = 1;],
- smart_include="-I$try",
- smart_include=)
- if test "x$smart_include" != "x"; then
- break;
- fi
+ [int a = 1;],
+ [
+ smart_include="-I$try"
+ AC_MSG_RESULT(yes)
+ break
+ ],
+ [
+ smart_include=
+ AC_MSG_RESULT(no)
+ ])
done
CFLAGS="$old_CFLAGS"
fi
dnl # Found it, set the appropriate variable.
dnl #
if test "x$smart_include" != "x"; then
- AC_MSG_RESULT(yes)
eval "ac_cv_header_$ac_safe=yes"
CFLAGS="$old_CFLAGS $smart_include"
SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-else
- AC_MSG_RESULT(no)
fi
])
AC_TRY_COMPILE([
$1
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
#endif
AC_DEFUN([FR_TLS],
[
AC_MSG_CHECKING(for TLS)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main() { return 0; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main(int argc, char *argv[]) { return val = argc; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
AC_MSG_RESULT($have_tls)
if test "$have_tls" = "yes"; then
AC_DEFINE([HAVE_THREAD_TLS],[1],[Define if the compiler supports __thread])
])
-AC_DEFUN([AC_LIB_READLINE], [
+AC_DEFUN([VL_LIB_READLINE], [
AC_CACHE_CHECK([for a readline compatible library],
- ac_cv_lib_readline, [
- ORIG_LIBS=$LIBS
+ vl_cv_lib_readline, [
+ ORIG_LIBS="$LIBS"
for readline_lib in readline edit editline; do
for termcap_lib in "" termcap curses ncurses; do
if test -z "$termcap_lib"; then
TRY_LIB="-l$readline_lib -l$termcap_lib"
fi
LIBS="$ORIG_LIBS $TRY_LIB"
- AC_TRY_LINK_FUNC(readline, ac_cv_lib_readline="$TRY_LIB")
- if test -n "$ac_cv_lib_readline"; then
+ AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
+ if test -n "$vl_cv_lib_readline"; then
LIBREADLINE="$TRY_LIB"
- AC_SUBST(LIBREADLINE)
break
fi
done
- if test -n "$ac_cv_lib_readline"; then
+ if test -n "$vl_cv_lib_readline"; then
break
fi
done
- if test -z "$ac_cv_lib_readline"; then
- ac_cv_lib_readline="no"
+ if test -z "$vl_cv_lib_readline"; then
+ vl_cv_lib_readline="no"
+ LIBS="$ORIG_LIBS"
fi
- LIBS=$ORIG_LIBS
])
- if test "$ac_cv_lib_readline" != "no"; then
+ if test "$vl_cv_lib_readline" != "no"; then
AC_DEFINE(HAVE_LIBREADLINE, 1,
[Define if you have a readline compatible library])
AC_CHECK_HEADERS(readline.h readline/readline.h)
AC_CACHE_CHECK([whether readline supports history],
- ac_cv_lib_readline_history, [
- ac_cv_lib_readline_history="no"
- AC_TRY_LINK_FUNC(add_history, ac_cv_lib_readline_history="yes")
+ [vl_cv_lib_readline_history], [
+ vl_cv_lib_readline_history="no"
+ AC_TRY_LINK_FUNC([add_history], [vl_cv_lib_readline_history="yes"])
])
- if test "$ac_cv_lib_readline_history" = "yes"; then
+ if test "$vl_cv_lib_readline_history" = "yes"; then
AC_DEFINE(HAVE_READLINE_HISTORY, 1,
[Define if your readline library has \`add_history'])
AC_CHECK_HEADERS(history.h readline/history.h)
fi
fi
-])
+ AC_SUBST(LIBREADLINE)
+])dnl
AC_INCLUDE(aclocal.m4)