Commit 69c27a30 authored by Pekka Pessi's avatar Pekka Pessi

m4/sac-su.m4: moved contents into sac-s2.m4

darcs-hash:20070528085928-65a35-03420e9b2d5bad485ff70afb29bbeb608eb1ddfa.gz
parent bb1ff757
......@@ -24,7 +24,7 @@ EXTRA_DIST = AUTHORS COPYING COPYRIGHTS ChangeLog.ext-trees \
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST += m4/sac-general.m4 m4/sac-su.m4 m4/sac-coverage.m4 \
EXTRA_DIST += m4/sac-general.m4 m4/sac-coverage.m4 \
m4/sac-su2.m4 m4/sac-tport.m4 m4/sac-openssl.m4
EXTRA_DIST += docs/build_system.txt \
......
......@@ -69,7 +69,6 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test $DOXYGEN != echo])
SAC_SOFIA_SU
SAC_OPENSSL
SAC_TPORT
SAC_SU
### internal modules
### ----------------
......
dnl ======================================================================
dnl su module
dnl ======================================================================
dnl The macro SAC_SOFIA_SU is in a separate file, sofia-su2.m4, because
dnl SAC_SOFIA_SU creates a separate configuration file <su/su_configure.h>.
dnl If SAC_SOFIA_SU is included to a aclocal.m4 of another package,
dnl autoheader returns a spurious error and automake complains about missing
dnl su/su_configure.h.
dnl ======================================================================
dnl SAC_WITH_RT - check for POSIX realtime library
dnl ======================================================================
AC_DEFUN([SAC_WITH_RT],[
AC_ARG_WITH(rt,
[ --with-rt use POSIX realtime library [[used by default]]])
])
dnl ======================================================================
dnl SAC_CHECK_SU_LIBS - check for libraries used by su
dnl ======================================================================
AC_DEFUN([SAC_CHECK_SU_LIBS], [
AC_REQUIRE([SAC_WITH_RT])
AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(socket, socketpair,,,-lnsl)
if test "${with_rt}" != no; then
AC_SEARCH_LIBS(clock_gettime, rt)
fi
])dnl
dnl ======================================================================
dnl SAC_SU - main macro for checking su dependencies
dnl ======================================================================
AC_DEFUN([SAC_SU], [
AC_REQUIRE([SAC_CHECK_SU_LIBS])
])
......@@ -2,11 +2,11 @@ dnl ======================================================================
dnl su module
dnl ======================================================================
AC_DEFUN([SAC_SU])
AC_DEFUN([SAC_SOFIA_SU], [
# Beginning of SAC_SOFIA_SU
AC_REQUIRE([SAC_WITH_RT])
# ======================================================================
# Check for features used by su
......@@ -368,7 +368,15 @@ fi
# Checks for libraries
# ===========================================================================
SAC_CHECK_SU_LIBS
AC_CHECK_LIB(pthread, pthread_create)
AC_CHECK_LIB(socket, socketpair,,,-lnsl)
AC_ARG_WITH(rt,
[ --with-rt use POSIX realtime library [[used by default]]])
if test "${with_rt}" != no; then
AC_SEARCH_LIBS(clock_gettime, rt)
AC_CHECK_FUNCS([clock_gettime clock_getcpuclockid])
fi
# No GLib path explicitly defined, use pkg-config
AC_ARG_WITH(glib,
......@@ -470,11 +478,6 @@ if test $ac_cv_func_if_nameindex = yes ; then
[Define to 1 if you have if_nameindex().])
fi
AC_REQUIRE([SAC_WITH_RT])
if test "${with_rt}" != no; then
AC_CHECK_FUNCS([clock_gettime clock_getcpuclockid])
fi
SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strcasestr strtoull \
inet_ntop inet_pton poll])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment