update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@138 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index ea4b6b1b1ef63d6452d0c2790f7958e1c1cc1bf7..eda687270d7dae5523e1631b8be3416a4e0b4b23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ NAME=freeswitch
 PREFIX=$(prefix)/${NAME}
 APR_CONFIG=$(prefix)/bin/apr-1-config
 AM_CFLAGS  = $(shell $(APR_CONFIG) --cflags --cppflags --includes)
-SOLINK=-shared -Xlinker -x
 AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) 
 OSARCH=$(shell uname -s)
 
@@ -16,6 +15,8 @@ endif
 
 if ISMAC
 SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+else
+SOLINK=-shared -Xlinker -x
 endif
 
 

diff --git a/Makefile.in b/Makefile.in
index 102c14d7f5b0209a518789f2031757944e32e648..bc12f81b328600da8eed126f346b39ff8457f9a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -230,11 +230,11 @@ AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
        -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
        -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
        -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"
-@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
-SOLINK = -shared -Xlinker -x
 AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1) \
        -L$(PREFIX)/lib
 OSARCH = $(shell uname -s)
+@ISMAC_FALSE@SOLINK = -shared -Xlinker -x
+@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
 libfreeswitch_la_SOURCES = \
 src/include/switch.h \
 src/include/switch_channel.h \