Detect the proper threading library where pthread_mutexattr_settype is
located. Look for regcomp only when not using internal regexp. git-svn-id: http://yate.null.ro/svn/yate/trunk@2672 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
0aa90824b3
commit
ac2afc3a99
|
@ -10,7 +10,7 @@ DEBUG :=
|
||||||
CXX := @CXX@ -Wall
|
CXX := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
LIBTHR:= -lpthread
|
LIBTHR:= @THREAD_LIB@
|
||||||
INCLUDES := -I. -I@srcdir@
|
INCLUDES := -I. -I@srcdir@
|
||||||
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||||
LDFLAGS:= @LDFLAGS@
|
LDFLAGS:= @LDFLAGS@
|
||||||
|
|
|
@ -10,7 +10,7 @@ DEBUG :=
|
||||||
CXX := @CXX@ -Wall
|
CXX := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
LIBTHR:= -lpthread
|
LIBTHR:= @THREAD_LIB@
|
||||||
INCLUDES := -I.. -I@top_srcdir@
|
INCLUDES := -I.. -I@top_srcdir@
|
||||||
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||||
LDFLAGS:= @LDFLAGS@ -L.. -lyate
|
LDFLAGS:= @LDFLAGS@ -L.. -lyate
|
||||||
|
|
12
configure.in
12
configure.in
|
@ -92,12 +92,17 @@ AC_HEADER_TIME
|
||||||
# Checks for library functions.
|
# Checks for library functions.
|
||||||
AC_FUNC_MALLOC
|
AC_FUNC_MALLOC
|
||||||
AC_TYPE_SIGNAL
|
AC_TYPE_SIGNAL
|
||||||
AC_CHECK_FUNCS([gettimeofday inet_ntoa memmove regcomp strerror], , [AC_MSG_ERROR([This function is required.])])
|
AC_CHECK_FUNCS([gettimeofday inet_ntoa memmove strerror], , [AC_MSG_ERROR([This function is required.])])
|
||||||
|
|
||||||
AC_CACHE_SAVE
|
AC_CACHE_SAVE
|
||||||
|
|
||||||
# Checks for required libraries.
|
# Checks for required libraries.
|
||||||
AC_CHECK_LIB([pthread], [pthread_mutexattr_settype], , [AC_MSG_ERROR([This library is required.])])
|
THREAD_LIB=""
|
||||||
|
AC_CHECK_LIB([pthread], [pthread_mutexattr_settype], [THREAD_LIB="-lpthread"])
|
||||||
|
if [[ "x$THREAD_LIB" = "x" ]]; then
|
||||||
|
AC_CHECK_LIB([c], [pthread_mutexattr_settype], , [AC_MSG_ERROR([This function is required.])])
|
||||||
|
fi
|
||||||
|
AC_SUBST(THREAD_LIB)
|
||||||
|
|
||||||
AC_MSG_CHECKING([for dlopen in default libs])
|
AC_MSG_CHECKING([for dlopen in default libs])
|
||||||
AC_LANG_SAVE
|
AC_LANG_SAVE
|
||||||
|
@ -106,7 +111,7 @@ AC_TRY_LINK([#include <dlfcn.h>],[dlopen("",0);],[have_dl=yes],[have_dl=no])
|
||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
AC_MSG_RESULT([$have_dl])
|
AC_MSG_RESULT([$have_dl])
|
||||||
if [[ "x$have_dl" != "xyes" ]]; then
|
if [[ "x$have_dl" != "xyes" ]]; then
|
||||||
AC_CHECK_LIB([dl], [dlopen], , [AC_MSG_ERROR([This library is required.])])
|
AC_CHECK_LIB([dl], [dlopen], , [AC_MSG_ERROR([This function is required.])])
|
||||||
DLOPEN_LIB="-ldl"
|
DLOPEN_LIB="-ldl"
|
||||||
fi
|
fi
|
||||||
AC_SUBST(DLOPEN_LIB)
|
AC_SUBST(DLOPEN_LIB)
|
||||||
|
@ -263,6 +268,7 @@ case "x$want_internalregex" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_MSG_RESULT([$INTERNAL_REGEX])
|
AC_MSG_RESULT([$INTERNAL_REGEX])
|
||||||
|
AC_CHECK_FUNCS([regcomp], , [INTERNAL_REGEX=yes])
|
||||||
AC_SUBST(INTERNAL_REGEX)
|
AC_SUBST(INTERNAL_REGEX)
|
||||||
|
|
||||||
HAVE_PGSQL=no
|
HAVE_PGSQL=no
|
||||||
|
|
|
@ -6,7 +6,7 @@ DEBUG :=
|
||||||
CXX := @CXX@ -Wall
|
CXX := @CXX@ -Wall
|
||||||
AR := ar
|
AR := ar
|
||||||
DEFS :=
|
DEFS :=
|
||||||
LIBTHR := -lpthread
|
LIBTHR := @THREAD_LIB@
|
||||||
INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
|
INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
|
||||||
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||||
LDFLAGS:= @LDFLAGS@ -L../.. -lyate
|
LDFLAGS:= @LDFLAGS@ -L../.. -lyate
|
||||||
|
|
Loading…
Reference in New Issue