arrgh
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@137 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
parent
1c318ac0ee
commit
db3992767e
|
|
@ -14,6 +14,11 @@ if ISLINUX
|
|||
AM_LDFLAGS += -Wl,-E
|
||||
endif
|
||||
|
||||
if ISMAC
|
||||
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
|
||||
endif
|
||||
|
||||
|
||||
AM_LDFLAGS += -L$(PREFIX)/lib
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -153,6 +153,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
ISLINUX_FALSE = @ISLINUX_FALSE@
|
||||
ISLINUX_TRUE = @ISLINUX_TRUE@
|
||||
ISMAC_FALSE = @ISMAC_FALSE@
|
||||
ISMAC_TRUE = @ISMAC_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
|
|
@ -228,6 +230,7 @@ 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
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ISLINUX_TRUE ISLINUX_FALSE LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -21373,6 +21373,16 @@ fi
|
|||
|
||||
|
||||
|
||||
if test `uname -s` = Darwin; then
|
||||
ISMAC_TRUE=
|
||||
ISMAC_FALSE='#'
|
||||
else
|
||||
ISMAC_TRUE='#'
|
||||
ISMAC_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -21493,6 +21503,13 @@ echo "$as_me: error: conditional \"ISLINUX\" was never defined.
|
|||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${ISMAC_TRUE}" && test -z "${ISMAC_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"ISMAC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
echo "$as_me: error: conditional \"ISMAC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
: ${CONFIG_STATUS=./config.status}
|
||||
ac_clean_files_save=$ac_clean_files
|
||||
|
|
@ -22094,6 +22111,8 @@ s,@LIBTOOL@,$LIBTOOL,;t t
|
|||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@ISLINUX_TRUE@,$ISLINUX_TRUE,;t t
|
||||
s,@ISLINUX_FALSE@,$ISLINUX_FALSE,;t t
|
||||
s,@ISMAC_TRUE@,$ISMAC_TRUE,;t t
|
||||
s,@ISMAC_FALSE@,$ISMAC_FALSE,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
CEOF
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ AC_CONFIG_FILES([Makefile
|
|||
])
|
||||
|
||||
AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
|
||||
AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
ISLINUX_FALSE = @ISLINUX_FALSE@
|
||||
ISLINUX_TRUE = @ISLINUX_TRUE@
|
||||
ISMAC_FALSE = @ISMAC_FALSE@
|
||||
ISMAC_TRUE = @ISMAC_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
|
|
|
|||
Loading…
Reference in New Issue