Yate has been ported on Mac OS X.
git-svn-id: http://yate.null.ro/svn/yate/trunk@3153 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
428653c665
commit
51b082375f
23
configure.in
23
configure.in
|
@ -317,10 +317,19 @@ AC_LANG_SAVE
|
|||
AC_LANG_C
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Wall -Werror $GCC_UNRESOLVED_SYMBOLS"
|
||||
SAVE_LIBS="$LIBS"
|
||||
AC_TRY_LINK([#include <netinet/in.h>
|
||||
#include <arpa/nameser.h>
|
||||
#include <resolv.h>],[res_init();],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
|
||||
if [[ "x$HAVE_RESOLV" != "xno" ]]; then
|
||||
#include <resolv.h>],[res_init();],[HAVE_RESOLV=yes])
|
||||
if [[ "x$HAVE_RESOLV" = "xno" ]]; then
|
||||
LIBS="$LIBS -lresolv"
|
||||
AC_TRY_LINK([#include <netinet/in.h>
|
||||
#include <arpa/nameser.h>
|
||||
#include <resolv.h>],[res_init();],
|
||||
[HAVE_RESOLV=yes RESOLV_LIB=-lresolv])
|
||||
fi
|
||||
LIBS="$SAVE_LIBS"
|
||||
if [[ "x$HAVE_RESOLV" != "xno" -a "x$RESOLV_LIB" = "x" ]]; then
|
||||
AC_TRY_LINK([#include <netinet/in.h>
|
||||
#include <arpa/nameser.h>
|
||||
#include <resolv.h>],[unsigned char x[2]; res_query("",0,0,x,0);],[],[RESOLV_LIB=-lresolv])
|
||||
|
@ -1066,20 +1075,28 @@ CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| *\)-g[[0-9]]*//' | sed 's/[[[:space:]]]\{2
|
|||
MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK"
|
||||
MODULE_CPPFLAGS="-fno-check-new $RTTI_OPT $MODULE_CFLAGS"
|
||||
MODULE_LDRELAX="-export-dynamic -shared"
|
||||
MODULE_SYMBOLS="-Wl,--retain-symbols-file,/dev/null"
|
||||
SONAME_OPT="-shared -Wl,-soname="
|
||||
case "x$uname_os" in
|
||||
x*BSD)
|
||||
INSTALL_D="install"
|
||||
MODULE_LDRELAX="$MODULE_LDRELAX -lc"
|
||||
;;
|
||||
xDarwin)
|
||||
INSTALL_D="install"
|
||||
MODULE_LDRELAX="-dynamiclib"
|
||||
MODULE_SYMBOLS=""
|
||||
SONAME_OPT="-dynamiclib -Wl,-dylib_install_name,"
|
||||
;;
|
||||
esac
|
||||
MODULE_LDFLAGS="$MODULE_LDRELAX $GCC_UNRESOLVED_SYMBOLS"
|
||||
MODULE_SYMBOLS="-Wl,--retain-symbols-file,/dev/null"
|
||||
AC_SUBST(INSTALL_D)
|
||||
AC_SUBST(MODULE_CFLAGS)
|
||||
AC_SUBST(MODULE_CPPFLAGS)
|
||||
AC_SUBST(MODULE_LDRELAX)
|
||||
AC_SUBST(MODULE_LDFLAGS)
|
||||
AC_SUBST(MODULE_SYMBOLS)
|
||||
AC_SUBST(SONAME_OPT)
|
||||
|
||||
|
||||
DOXYGEN_BIN=""
|
||||
|
|
|
@ -14,6 +14,7 @@ INCLUDES := -I.. -I@top_srcdir@
|
|||
CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@
|
||||
CPPFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||
LDFLAGS:= @LDFLAGS@
|
||||
SONAME_OPT := @SONAME_OPT@
|
||||
LDCONFIG:=true
|
||||
|
||||
MKDEPS := ../config.status
|
||||
|
@ -38,7 +39,7 @@ COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
|
|||
LINK = $(CXX) $(LDFLAGS)
|
||||
|
||||
ifeq (@INTERNAL_REGEX@,yes)
|
||||
REGEX_INC:= -I@top_srcdir@/engine/regex
|
||||
REGEX_INC:= -I@top_srcdir@/engine/regex -UDEBUG
|
||||
LIBOBJS := $(LIBOBJS) regex.o
|
||||
else
|
||||
REGEX_INC:=
|
||||
|
@ -115,4 +116,4 @@ Makefile: @srcdir@/Makefile.in $(MKDEPS)
|
|||
cd .. && ./config.status
|
||||
|
||||
../$(YLIB): $(LIBOBJS) $(LIBS)
|
||||
$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $^ $(LIBTHR) $(LIBAUX)
|
||||
$(LINK) -o $@ $(SONAME_OPT)$(YLIB) $^ $(LIBTHR) $(LIBAUX)
|
||||
|
|
|
@ -35,7 +35,7 @@ typedef HANDLE HSEMAPHORE;
|
|||
|
||||
#ifdef MUTEX_HACK
|
||||
extern "C" {
|
||||
#if defined(__FreeBSD__)
|
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr, int __kind);
|
||||
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
||||
#else
|
||||
|
|
|
@ -9,6 +9,7 @@ DEFS :=
|
|||
INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@
|
||||
CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||
LDFLAGS:= @LDFLAGS@
|
||||
SONAME_OPT := @SONAME_OPT@
|
||||
YATELIBS := -L../.. -lyate @LIBS@
|
||||
INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/yatexml.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h
|
||||
|
||||
|
@ -58,7 +59,7 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
|||
cd ../.. && ./config.status
|
||||
|
||||
../../$(LIBD_VER): $(OBJS) $(YXML)
|
||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATELIBS) @RESOLV_LIB@
|
||||
$(LINK) -o $@ $(SONAME_OPT)$(LIBD_VER) $^ $(YATELIBS) @RESOLV_LIB@
|
||||
|
||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||
|
|
|
@ -9,6 +9,7 @@ DEFS :=
|
|||
INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
|
||||
CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||
LDFLAGS:= @LDFLAGS@
|
||||
SONAME_OPT := @SONAME_OPT@
|
||||
YATELIBS := -L../.. -lyate @LIBS@
|
||||
INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemgcp.h
|
||||
|
||||
|
@ -57,7 +58,7 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
|||
cd ../.. && ./config.status
|
||||
|
||||
../../$(LIBD_VER): $(OBJS)
|
||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATELIBS)
|
||||
$(LINK) -o $@ $(SONAME_OPT)$(LIBD_VER) $^ $(YATELIBS)
|
||||
|
||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||
|
|
|
@ -10,6 +10,7 @@ LIBTHR := @THREAD_LIB@
|
|||
INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
|
||||
CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
|
||||
LDFLAGS:= @LDFLAGS@
|
||||
SONAME_OPT := @SONAME_OPT@
|
||||
YATELIBS := -L../.. -lyate @LIBS@
|
||||
INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesig.h
|
||||
|
||||
|
@ -65,7 +66,7 @@ Makefile: @srcdir@/Makefile.in ../../config.status
|
|||
cd ../.. && ./config.status
|
||||
|
||||
../../$(LIBD_VER): $(OBJS)
|
||||
$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATELIBS)
|
||||
$(LINK) -o $@ $(SONAME_OPT)$(LIBD_VER) $^ $(YATELIBS)
|
||||
|
||||
../../$(LIBD_DEV): ../../$(LIBD_VER)
|
||||
cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
|
||||
|
|
|
@ -167,6 +167,9 @@ strip: all do-strip
|
|||
.PHONY: clean
|
||||
clean: do-clean
|
||||
@-$(RM) $(PROGS) $(LIBS) *.o qt4/*.moc core 2>/dev/null
|
||||
@-for i in $(PROGS) ; do \
|
||||
$(RM) -rf $$i.dSYM 2>/dev/null; \
|
||||
done;
|
||||
|
||||
.PHONY: install
|
||||
install: all do-install
|
||||
|
|
|
@ -417,14 +417,9 @@ void NDebug(const char* facility, int level, const char* format, ...);
|
|||
void NDebug(const DebugEnabler* local, int level, const char* format, ...);
|
||||
#endif
|
||||
|
||||
#ifdef _DEBUG
|
||||
#if defined(_DEBUG) || defined(DEBUG) || defined(XDEBUG)
|
||||
#undef DEBUG
|
||||
#define DEBUG
|
||||
#endif
|
||||
|
||||
#ifdef XDEBUG
|
||||
#undef DEBUG
|
||||
#define DEBUG
|
||||
#define DEBUG 1
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
Loading…
Reference in New Issue