Fixes for building in FreeBSD.

git-svn-id: http://voip.null.ro/svn/yate@1946 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2008-04-24 10:10:01 +00:00
parent 3b98b21430
commit 6d73b5fb25
5 changed files with 28 additions and 9 deletions

View File

@ -82,19 +82,19 @@ install: all do-install
$(if $(MENUFILES),\
@mkdir -p "$(DESTDIR)$(menudir)/" && \
for i in $(MENUFILES) ; do \
install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(menudir)/$$i" ; \
@INSTALL_D@ -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(menudir)/$$i" ; \
done \
)
$(if $(ICONFILES),\
@mkdir -p "$(DESTDIR)$(icondir)/" && \
for i in $(ICONFILES) ; do \
install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(icondir)/$$i" ; \
@INSTALL_D@ -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(icondir)/$$i" ; \
done \
)
$(if $(DESKFILES),\
@mkdir -p "$(DESTDIR)$(deskdir)/" && \
for i in $(DESKFILES) ; do \
install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(deskdir)/$$i" ; \
@INSTALL_D@ -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(deskdir)/$$i" ; \
done \
)

View File

@ -212,15 +212,23 @@ AC_SUBST(HAVE_SCTP_NETINET)
# Checks for optional libraries.
HAVE_RESOLV=no
RESOLV_LIB=""
AC_MSG_CHECKING([for resolver library])
AC_LANG_SAVE
AC_LANG_C
AC_TRY_LINK([#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>],[res_init();],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Werror $GCC_UNRESOLVED_SYMBOLS"
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])
CFLAGS="$SAVE_CFLAGS"
AC_LANG_RESTORE
AC_MSG_RESULT([$HAVE_RESOLV])
AC_MSG_RESULT([$HAVE_RESOLV $RESOLV_LIB])
AC_SUBST(HAVE_RESOLV)
AC_SUBST(RESOLV_LIB)
INTERNAL_REGEX=yes
AC_ARG_ENABLE(internalregex,AC_HELP_STRING([--enable-internalregex],[Use internal regexp library (default: not on Linux)]),want_internalregex=$enableval,want_internalregex=auto)
@ -828,11 +836,19 @@ AC_MSG_WARN([Mismatched RTTI setting between Yate ($USE_RTTI) and pwlib ($PWLIB_
fi
fi
INSTALL_D="install -D"
MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK"
MODULE_CPPFLAGS="-fno-check-new $RTTI_OPT $MODULE_CFLAGS"
MODULE_LDRELAX="-export-dynamic -shared"
case "x$uname_os" in
x*BSD)
INSTALL_D="install"
MODULE_LDRELAX="$MODULE_LDRELAX -lc"
;;
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)

View File

@ -147,7 +147,7 @@ install: all do-install
mkdir -p "$(DESTDIR)$(moddir)/$$i" ; \
done; \
for i in $(PROGS) ; do \
install -D "$$i" "$(DESTDIR)$(moddir)/$$i" ; \
@INSTALL_D@ "$$i" "$(DESTDIR)$(moddir)/$$i" ; \
done;
.PHONY: uninstall
@ -216,7 +216,7 @@ server/pgsqldb.yate: LOCALLIBS = -lpq
server/mysqldb.yate: LOCALFLAGS = @MYSQL_INC@
server/mysqldb.yate: LOCALLIBS = @MYSQL_LIB@
enumroute.yate: LOCALLIBS = -lresolv
enumroute.yate: LOCALLIBS = @RESOLV_LIB@
client/alsachan.yate: LOCALLIBS = -lasound

View File

@ -18,7 +18,7 @@ install:
@lst="`cd @srcdir@; ls -1 -d *.yhlp`" ; \
mkdir -p "$(DESTDIR)$(helpdir)/" && \
for i in $$lst ; do \
install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(helpdir)/$$i" ; \
@INSTALL_D@ -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(helpdir)/$$i" ; \
done;
uninstall:

View File

@ -16,9 +16,12 @@ all clean:
install:
@lst="`cd @srcdir@; ls -1 -d */* | sed '/CVS\|\.orig/d'`" ; \
mkdir -p "$(DESTDIR)$(skindir)/" && \
dir="`echo "$$lst" | sed 's,/.*,,' | uniq`" ; \
for i in $$dir ; do \
mkdir -p "$(DESTDIR)$(skindir)/$$i" ; \
done; \
for i in $$lst ; do \
install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(skindir)/$$i" ; \
install -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(skindir)/$$i" ; \
done;
uninstall: