From 3ec59cdb34ac3852ac78aa4144f98ebb58666573 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 20 Jan 2009 16:29:32 +0000 Subject: [PATCH] fix esl solaris build (FSBUILD-104) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11310 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 2 +- configure.in | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index ffafc5bb86..f87764f2eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,7 +168,7 @@ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_e freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include -fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread +fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la diff --git a/configure.in b/configure.in index da6ee48f7d..ae58753672 100644 --- a/configure.in +++ b/configure.in @@ -174,7 +174,7 @@ fi AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) - +ESL_LDFLAGS= # tweak platform specific flags case "$host" in *darwin*) @@ -183,6 +183,7 @@ case "$host" in ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) + APR_ADDTO(ESL_LDFLAGS, -lnsl) ;; *bsd*) APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) @@ -194,6 +195,7 @@ APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99) AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) +AC_SUBST(ESL_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN)