[svn-commits] tilghman: trunk r276871 - in /trunk: ./ main/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jul 15 23:45:33 2010
New Revision: 276871

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276871
Log:
Fix build on FreeBSD

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/main/Makefile
    trunk/makeopts.in

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=276871&r1=276870&r2=276871
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jul 15 23:45:33 2010
@@ -480,6 +480,19 @@
 	AC_MSG_RESULT(no)
 )
 
+AC_MSG_CHECKING(for a version of GNU ld that supports the --dynamic-list flag)
+old_LDFLAGS=${LDFLAGS}
+LDFLAGS+="-Wl,--dynamic-list,main/asterisk.dynamics"
+PBX_DYNAMIC_LIST=0
+AC_LINK_IFELSE(
+	AC_LANG_PROGRAM([], []),
+	PBX_DYNAMIC_LIST=1
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no)
+)
+AC_SUBST(PBX_DYNAMIC_LIST)
+LDFLAGS=${old_LDFLAGS}
+
 AC_CHECK_HEADER([sys/poll.h], 
    [HAS_POLL=1]
    AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=276871&r1=276870&r2=276871
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Thu Jul 15 23:45:33 2010
@@ -95,7 +95,10 @@
 endif
 
 ifeq ($(GNU_LD),1)
-ASTLINK+=-Wl,--version-script,asterisk.exports,--dynamic-list,asterisk.dynamics
+ASTLINK+=-Wl,--version-script,asterisk.exports
+  ifeq ($(HAVE_DYNAMIC_LIST),1)
+  ASTLINK+=-Wl,--dynamic-list,asterisk.dynamics
+  endif
 endif
 
 CHECK_SUBDIR:	# do nothing, just make sure that we recurse in the subdir/

Modified: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=276871&r1=276870&r2=276871
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Thu Jul 15 23:45:33 2010
@@ -58,6 +58,7 @@
 
 GNU_LD=@GNU_LD@
 WEAKREF=@PBX_WEAKREF@
+HAVE_DYNAMIC_LIST=@PBX_DYNAMIC_LIST@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@