提交 3ec59cdb authored 作者: Michael Jerris's avatar Michael Jerris

fix esl solaris build (FSBUILD-104)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11310 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 effb166b
...@@ -168,7 +168,7 @@ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_e ...@@ -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 freeswitch_SOURCES = src/switch.c
nodist_freeswitch_SOURCES = src/include/switch_version.h nodist_freeswitch_SOURCES = src/include/switch_version.h
fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include 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_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir)
freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
......
...@@ -174,7 +174,7 @@ fi ...@@ -174,7 +174,7 @@ fi
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
ESL_LDFLAGS=
# tweak platform specific flags # tweak platform specific flags
case "$host" in case "$host" in
*darwin*) *darwin*)
...@@ -183,6 +183,7 @@ case "$host" in ...@@ -183,6 +183,7 @@ case "$host" in
;; ;;
*-solaris2*) *-solaris2*)
APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048)
APR_ADDTO(ESL_LDFLAGS, -lnsl)
;; ;;
*bsd*) *bsd*)
APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include)
...@@ -194,6 +195,7 @@ APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99) ...@@ -194,6 +195,7 @@ APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)
AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_AM_CFLAGS)
AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS)
AC_SUBST(SWITCH_AM_LDFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS)
AC_SUBST(ESL_LDFLAGS)
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN) AC_SUBST(DYNAMIC_LIB_EXTEN)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论