- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4528 - freeswitch/trunk
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 05:05:56 2007 New Revision: 4528 Modified: freeswitch/trunk/generic_mod.mk Log: move all the generic modules to use libtool to link. Modified: freeswitch/trunk/generic_mod.mk ============================================================================== --- freeswitch/trunk/generic_mod.mk (original) +++ freeswitch/trunk/generic_mod.mk Sun Mar 11 05:05:56 2007 @@ -2,10 +2,10 @@ $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o - $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) + $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) clean: - rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs install: - cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod + $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

1 0

[commit] r4526 - in freeswitch/trunk: . libs/apr libs/apr-util libs/pcre libs/sqlite
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 04:33:49 2007 New Revision: 4526 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/configure freeswitch/trunk/libs/apr-util/configure.gnu freeswitch/trunk/libs/apr/configure.gnu freeswitch/trunk/libs/pcre/configure.gnu freeswitch/trunk/libs/sqlite/configure.gnu Log: fix pic flags and some typos. Core now builds all static Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 11 04:33:49 2007 @@ -75,8 +75,7 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libresample/include CORE_CFLAGS += -I$(switch_srcdir)/libs/libteletone/src -CORE_LIBS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --link-libtool ) -CORE_LIBS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --link-libtool ) +CORE_LIBS = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la CORE_LIBS += libs/srtp/libsrtp.la libs/libresample/libresample.la CORE_LIBS += libs/libteletone/libteletone.la Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Sun Mar 11 04:33:49 2007 @@ -81,7 +81,12 @@ "$(DESTDIR)$(library_includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libfreeswitch_la_DEPENDENCIES = +am__DEPENDENCIES_1 = libs/apr/libapr-1.la \ + libs/apr-util/libaprutil-1.la libs/sqlite/libsqlite3.la \ + libs/pcre/libpcre.la libs/srtp/libsrtp.la \ + libs/libresample/libresample.la \ + libs/libteletone/libteletone.la +libfreeswitch_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libfreeswitch_la_OBJECTS = libfreeswitch_la-switch_apr.lo \ libfreeswitch_la-switch_buffer.lo \ libfreeswitch_la-switch_caller.lo \ @@ -105,8 +110,8 @@ PROGRAMS = $(bin_PROGRAMS) am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT) freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) -am__DEPENDENCIES_1 = $(BASE)/libfreeswitch.la -freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = $(BASE)/libfreeswitch.la +freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp am__depfiles_maybe = depfiles @@ -261,6 +266,7 @@ size_t_value = @size_t_value@ ssize_t_fmt = @ssize_t_fmt@ ssize_t_value = @ssize_t_value@ +subdirs = @subdirs@ switch_builddir = @switch_builddir@ switch_srcdir = @switch_srcdir@ sysconfdir = @sysconfdir@ @@ -334,24 +340,23 @@ -I$(switch_srcdir)/libs/srtp/crypto/include \ -I$(switch_srcdir)/libs/libresample/include \ -I$(switch_srcdir)/libs/libteletone/src -CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config \ - --link-ld --libs ) $(shell \ - $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs ) +CORE_LIBS = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la \ + libs/sqlite/libsqlite3.la libs/pcre/libpcre.la \ + libs/srtp/libsrtp.la libs/libresample/libresample.la \ + libs/libteletone/libteletone.la lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(CORE_LDFLAGS) $(AM_LDFLAGS) -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) +libfreeswitch_la_LIBADD = $(CORE_LIBS) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h -BUILT_SOURCES = version depends freeswitch_SOURCES = src/switch.c\ src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = ${MOD_LINK} -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all: all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -947,8 +952,7 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive +check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES @@ -957,8 +961,7 @@ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive +install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -983,7 +986,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1062,7 +1064,7 @@ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS -$(libfreeswitch_la_SOURCES): depends version +$(libfreeswitch_la_SOURCES): deps version: Makefile src/include/switch_version.h MAKE=$(MAKE) ./build/checkversion.sh @@ -1079,22 +1081,32 @@ yesdepends: rm .nodepends -depends: - @echo making depends - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) - @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) - mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX) - ./build/buildlib.sh . install libresample --prefix=$(PREFIX) - ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) - ./build/buildlib.sh . install srtp --prefix=$(PREFIX) - ./build/buildlib.sh . install pcre --prefix=$(PREFIX) - rm build/freeswitch.env +sqlite: + cd libs/sqlite && $(MAKE) + +apr: + cd libs/apr && $(MAKE) + +apr-util: + cd libs/apr-util && $(MAKE) + +pcre: + cd libs/pcre && $(MAKE) + +srtp: + cd libs/srtp && $(MAKE) + +resample: + cd libs/libresample && $(MAKE) + +teletone: + cd libs/libteletone && $(MAKE) + +deps: version sqlite apr apr-util pcre srtp resample teletone + +core: deps libfreeswitch.la -modules: $(NAME) +modules: libfreeswitch.la @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi @echo making modules @rm -f build/freeswitch.env Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Sun Mar 11 04:33:49 2007 @@ -466,7 +466,14 @@ # 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 switch_srcdir switch_builddir 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 PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE LTLIBOBJS' +ac_subdirs_all="$ac_subdirs_all libs/srtp" +ac_subdirs_all="$ac_subdirs_all libs/sqlite" +ac_subdirs_all="$ac_subdirs_all libs/libresample" +ac_subdirs_all="$ac_subdirs_all libs/libteletone" +ac_subdirs_all="$ac_subdirs_all libs/pcre" +ac_subdirs_all="$ac_subdirs_all libs/apr" +ac_subdirs_all="$ac_subdirs_all libs/apr-util" +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 switch_srcdir switch_builddir 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 PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3852,7 +3859,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3855 "configure"' > conftest.$ac_ext + echo '#line 3862 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5451,7 +5458,7 @@ # Provide some information about the compiler. -echo "$as_me:5454:" \ +echo "$as_me:5461:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6514,11 +6521,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6517: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6524: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6521: \$? = $ac_status" >&5 + echo "$as_me:6528: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6782,11 +6789,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6785: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6792: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6789: \$? = $ac_status" >&5 + echo "$as_me:6796: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6886,11 +6893,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6889: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6896: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6893: \$? = $ac_status" >&5 + echo "$as_me:6900: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9231,7 +9238,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9234 "configure" +#line 9241 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9331,7 +9338,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9334 "configure" +#line 9341 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11671,11 +11678,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11674: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11681: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11678: \$? = $ac_status" >&5 + echo "$as_me:11685: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11775,11 +11782,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11785: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11782: \$? = $ac_status" >&5 + echo "$as_me:11789: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13345,11 +13352,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13355: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13352: \$? = $ac_status" >&5 + echo "$as_me:13359: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13449,11 +13456,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13452: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13459: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13456: \$? = $ac_status" >&5 + echo "$as_me:13463: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15652,11 +15659,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15655: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15662: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15659: \$? = $ac_status" >&5 + echo "$as_me:15666: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15920,11 +15927,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15923: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15930: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15927: \$? = $ac_status" >&5 + echo "$as_me:15934: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16024,11 +16031,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16034: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16031: \$? = $ac_status" >&5 + echo "$as_me:16038: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25000,6 +25007,35 @@ fi +# Run configure in all the subdirs + + +subdirs="$subdirs libs/srtp" + + + +subdirs="$subdirs libs/sqlite" + + + +subdirs="$subdirs libs/libresample" + + + +subdirs="$subdirs libs/libteletone" + + + +subdirs="$subdirs libs/pcre" + + + +subdirs="$subdirs libs/apr" + + + +subdirs="$subdirs libs/apr-util" + ac_config_files="$ac_config_files src/include/switch_version.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -25776,6 +25812,7 @@ s,@ISMAC_FALSE@,$ISMAC_FALSE,;t t s,@IS64BITLINUX_TRUE@,$IS64BITLINUX_TRUE,;t t s,@IS64BITLINUX_FALSE@,$IS64BITLINUX_FALSE,;t t +s,@subdirs@,$subdirs,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -26492,3 +26529,180 @@ $ac_cs_success || { (exit 1); exit 1; } fi +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d $srcdir/$ac_dir || continue + + { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 +echo "$as_me: configuring in $ac_dir" >&6;} + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| \ + . : '$.$' 2>/dev/null || +echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X$\/\/$[^/].*/{ s//\1/; q; } + /^X$\/\/$$/{ s//\1/; q; } + /^X$\/$.*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + cd $ac_dir + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" + elif test -f $ac_srcdir/configure; then + ac_sub_configure="$SHELL '$ac_srcdir/configure'" + elif test -f $ac_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file=$ac_top_builddir$cache_file ;; + esac + + { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval $ac_sub_configure $ac_sub_configure_args \ + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} + { (exit 1); exit 1; }; } + fi + + cd $ac_popdir + done +fi + Modified: freeswitch/trunk/libs/apr-util/configure.gnu ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.gnu (original) +++ freeswitch/trunk/libs/apr-util/configure.gnu Sun Mar 11 04:33:49 2007 @@ -1,2 +1,3 @@ #! /bin/sh -./configure "$@" --with-apr=../apr --disable-shared +./configure "$@" --with-apr=../apr --disable-shared --with-pic + Modified: freeswitch/trunk/libs/apr/configure.gnu ============================================================================== --- freeswitch/trunk/libs/apr/configure.gnu (original) +++ freeswitch/trunk/libs/apr/configure.gnu Sun Mar 11 04:33:49 2007 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --disable-shared +./configure "$@" --disable-shared --with-pic Modified: freeswitch/trunk/libs/pcre/configure.gnu ============================================================================== --- freeswitch/trunk/libs/pcre/configure.gnu (original) +++ freeswitch/trunk/libs/pcre/configure.gnu Sun Mar 11 04:33:49 2007 @@ -1,3 +1,2 @@ #! /bin/sh -./configure "$@" --disable-shared - +./configure "$@" --disable-shared --with-pic Modified: freeswitch/trunk/libs/sqlite/configure.gnu ============================================================================== --- freeswitch/trunk/libs/sqlite/configure.gnu (original) +++ freeswitch/trunk/libs/sqlite/configure.gnu Sun Mar 11 04:33:49 2007 @@ -1,2 +1,3 @@ #! /bin/sh -./configure "$@" --disable-tcl --enable-threadsafe --disable-shared +./configure "$@" --disable-tcl --enable-threadsafe --disable-shared --with-pic +

1 0

[commit] r4525 - freeswitch/trunk
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 03:36:49 2007 New Revision: 4525 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: core deps will now be configured along with the core configure, and will be static non-installed and linked only to the core. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 11 03:36:49 2007 @@ -75,21 +75,23 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libresample/include CORE_CFLAGS += -I$(switch_srcdir)/libs/libteletone/src -CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --link-ld --libs ) -CORE_LDFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs ) +CORE_LIBS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --link-libtool ) +CORE_LIBS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --link-libtool ) +CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la +CORE_LIBS += libs/srtp/libsrtp.la libs/libresample/libresample.la +CORE_LIBS += libs/libteletone/libteletone.la lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(CORE_LDFLAGS) $(AM_LDFLAGS) -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) +libfreeswitch_la_LIBADD = $(CORE_LIBS) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h -$(libfreeswitch_la_SOURCES): depends version +$(libfreeswitch_la_SOURCES): deps MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h -BUILT_SOURCES = version depends bin_PROGRAMS = freeswitch freeswitch_SOURCES = src/switch.c\ @@ -112,23 +114,32 @@ yesdepends: rm .nodepends -depends: - @echo making depends - @rm -f build/freeswitch.env - @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) - @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) - mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX) - ./build/buildlib.sh . install libresample --prefix=$(PREFIX) - ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) - ./build/buildlib.sh . install srtp --prefix=$(PREFIX) - ./build/buildlib.sh . install pcre --prefix=$(PREFIX) - rm build/freeswitch.env +sqlite: + cd libs/sqlite && $(MAKE) + +apr: + cd libs/apr && $(MAKE) + +apr-util: + cd libs/apr-util && $(MAKE) + +pcre: + cd libs/pcre && $(MAKE) + +srtp: + cd libs/srtp && $(MAKE) + +resample: + cd libs/libresample && $(MAKE) + +teletone: + cd libs/libteletone && $(MAKE) + +deps: version sqlite apr apr-util pcre srtp resample teletone +core: deps libfreeswitch.la -modules: $(NAME) +modules: libfreeswitch.la @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi @echo making modules @rm -f build/freeswitch.env Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Mar 11 03:36:49 2007 @@ -276,4 +276,12 @@ AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64]) +# Run configure in all the subdirs +AC_CONFIG_SUBDIRS(libs/srtp) +AC_CONFIG_SUBDIRS(libs/sqlite) +AC_CONFIG_SUBDIRS(libs/libresample) +AC_CONFIG_SUBDIRS(libs/libteletone) +AC_CONFIG_SUBDIRS(libs/pcre) +AC_CONFIG_SUBDIRS(libs/apr) +AC_CONFIG_SUBDIRS(libs/apr-util) AC_OUTPUT([src/include/switch_version.h])

1 0

[commit] r4523 - freeswitch/trunk
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 03:13:49 2007 New Revision: 4523 Modified: freeswitch/trunk/Makefile.in Log: keeping the generated files in sync Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Sun Mar 11 03:13:49 2007 @@ -105,7 +105,8 @@ PROGRAMS = $(bin_PROGRAMS) am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT) freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) -freeswitch_DEPENDENCIES = ${top_builddir}/libfreeswitch.la +am__DEPENDENCIES_1 = $(BASE)/libfreeswitch.la +freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp am__depfiles_maybe = depfiles @@ -187,7 +188,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTOOL = $(PWD)/libtool +LIBTOOL = $(switch_builddir)/libtool LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -274,7 +275,7 @@ AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1) AM_CPPFLAGS = $(AM_CFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) -BASE = $(PWD) +BASE = $(switch_srcdir) OSARCH = $(shell uname -s) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) libfreeswitch_la_SOURCES = \ @@ -325,15 +326,14 @@ src/include/switch_log.h\ src/include/switch_xml.h -BUILT_SOURCES = version depends -CLEANFILES = src/include/switch_version.h CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags \ --cppflags --includes) $(shell \ $(switch_srcdir)/libs/apr-util/apu-1-config --includes) \ - -I$(PWD)/libs/sqlite -I$(PWD)/libs/pcre \ - -I$(PWD)/libs/srtp/include -I$(PWD)/libs/srtp/crypto/include \ - -I$(PWD)/libs/libresample/include \ - -I$(PWD)/libs/libteletone/src + -I$(switch_srcdir)/libs/sqlite -I$(switch_srcdir)/libs/pcre \ + -I$(switch_srcdir)/libs/srtp/include \ + -I$(switch_srcdir)/libs/srtp/crypto/include \ + -I$(switch_srcdir)/libs/libresample/include \ + -I$(switch_srcdir)/libs/libteletone/src CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config \ --link-ld --libs ) $(shell \ $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs ) @@ -342,11 +342,14 @@ libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(CORE_LDFLAGS) $(AM_LDFLAGS) libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h +MOD_LINK = $(BASE)/libfreeswitch.la +CLEANFILES = src/include/switch_version.h +BUILT_SOURCES = version depends freeswitch_SOURCES = src/switch.c\ - src/include/switch_version.h + src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDADD = ${top_builddir}/libfreeswitch.la +freeswitch_LDADD = ${MOD_LINK} all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1099,7 +1102,7 @@ @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env BASE "$(PWD)" + @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @@ -1107,6 +1110,10 @@ @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @rm -f build/freeswitch.env @@ -1131,9 +1138,17 @@ install_mod: modules @echo Installing $(NAME) - @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/log/xml_cdr $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar - @if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/*.xml $(PREFIX)/conf/; fi - @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi + @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ + done + @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ + $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ + fi + @if [ -f .libs/$(NAME) ] ; then \ + $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ + else \ + $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ + fi @echo Installing Modules @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" @@ -1141,12 +1156,16 @@ @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env BASE "$(PWD)" + @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done

1 0

[commit] r4522 - in freeswitch/trunk/libs: apr libteletone pcre
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 03:06:37 2007 New Revision: 4522 Added: freeswitch/trunk/libs/apr/configure.gnu - copied unchanged from r4521, /freeswitch/private/packaging/libs/srtp/configure.gnu freeswitch/trunk/libs/libteletone/configure.gnu - copied unchanged from r4521, /freeswitch/private/packaging/libs/srtp/configure.gnu freeswitch/trunk/libs/pcre/configure.gnu - copied unchanged from r4521, /freeswitch/private/packaging/libs/srtp/configure.gnu Log: add configure.gnu in prep for rolling the core deps configure into the core configure.

1 0

[commit] r4521 - freeswitch/trunk
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 01:49:21 2007 New Revision: 4521 Modified: freeswitch/trunk/Makefile.am Log: merge a few more cleanups from my branch. More changes coming shortly. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 11 01:49:21 2007 @@ -1,4 +1,5 @@ EXTRA_DIST = +SUBDIRS = AUTOMAKE_OPTS = gnu foreign NAME=freeswitch PREFIX=$(prefix) @@ -36,7 +37,7 @@ src/switch_log.c\ src/switch_xml.c -library_includedir = $(PREFIX)/include +library_includedir = $(PREFIX)/include library_include_HEADERS = \ src/include/switch_am_config.h\ @@ -143,6 +144,10 @@ @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done @rm -f build/freeswitch.env @@ -191,6 +196,10 @@ @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" + @./build/addenv.sh build/freeswitch.env LINK "$(LINK)" + @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)" + @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)" + @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)" @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done

1 0

[commit] r4520 - freeswitch/trunk
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 01:36:04 2007 New Revision: 4520 Modified: freeswitch/trunk/Makefile.am Log: merge a few more cleanups from my branch. More changes coming shortly. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Mar 11 01:36:04 2007 @@ -1,5 +1,4 @@ EXTRA_DIST = -SUBDIRS = AUTOMAKE_OPTS = gnu foreign NAME=freeswitch PREFIX=$(prefix) @@ -7,9 +6,10 @@ AM_CFLAGS = $(SWITCH_AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) -BASE = $(PWD) +BASE = $(switch_srcdir) OSARCH=$(shell uname -s) -LIBTOOL=$(PWD)/libtool + +LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) if CRASHPROT @@ -65,17 +65,14 @@ src/include/switch_log.h\ src/include/switch_xml.h -BUILT_SOURCES = version depends -CLEANFILES = src/include/switch_version.h - CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes) CORE_CFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --includes) -CORE_CFLAGS += -I$(PWD)/libs/sqlite -CORE_CFLAGS += -I$(PWD)/libs/pcre -CORE_CFLAGS += -I$(PWD)/libs/srtp/include -CORE_CFLAGS += -I$(PWD)/libs/srtp/crypto/include -CORE_CFLAGS += -I$(PWD)/libs/libresample/include -CORE_CFLAGS += -I$(PWD)/libs/libteletone/src +CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite +CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre +CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include +CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include +CORE_CFLAGS += -I$(switch_srcdir)/libs/libresample/include +CORE_CFLAGS += -I$(switch_srcdir)/libs/libteletone/src CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --link-ld --libs ) CORE_LDFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs ) @@ -88,12 +85,16 @@ $(libfreeswitch_la_SOURCES): depends version -bin_PROGRAMS = freeswitch +MOD_LINK = $(BASE)/libfreeswitch.la + +CLEANFILES = src/include/switch_version.h +BUILT_SOURCES = version depends -freeswitch_SOURCES = src/switch.c\ - src/include/switch_version.h +bin_PROGRAMS = freeswitch +freeswitch_SOURCES = src/switch.c\ + src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDADD = ${top_builddir}/libfreeswitch.la +freeswitch_LDADD = ${MOD_LINK} version: Makefile src/include/switch_version.h MAKE=$(MAKE) ./build/checkversion.sh @@ -134,7 +135,7 @@ @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" - @./build/addenv.sh build/freeswitch.env BASE "$(PWD)" + @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @@ -166,9 +167,17 @@ install_mod: modules @echo Installing $(NAME) - @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/log/xml_cdr $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar - @if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/*.xml $(PREFIX)/conf/; fi - @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi + @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ + done + @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ + $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ + fi + @if [ -f .libs/$(NAME) ] ; then \ + $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ + else \ + $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ + fi @echo Installing Modules @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)" @@ -176,7 +185,7 @@ @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)" - @./build/addenv.sh build/freeswitch.env BASE "$(PWD)" + @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)" @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)" @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)" @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"

1 0

[commit] r4519 - freeswitch/trunk/libs/sqlite
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 01:22:41 2007 New Revision: 4519 Added: freeswitch/trunk/libs/sqlite/configure.gnu - copied, changed from r4518, /freeswitch/private/packaging/libs/sqlite/configure.gnu Log: add configure.gnu in prep for rolling the core deps configure into the core configure. Copied: freeswitch/trunk/libs/sqlite/configure.gnu (from r4518, /freeswitch/private/packaging/libs/sqlite/configure.gnu) ============================================================================== --- /freeswitch/private/packaging/libs/sqlite/configure.gnu (original) +++ freeswitch/trunk/libs/sqlite/configure.gnu Sun Mar 11 01:22:41 2007 @@ -1,2 +1,2 @@ #! /bin/sh -./configure "$@" --disable-tcl --enable-threadsafe +./configure "$@" --disable-tcl --enable-threadsafe --disable-shared

1 0

[commit] r4518 - freeswitch/trunk/libs/apr-util
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 01:17:54 2007 New Revision: 4518 Added: freeswitch/trunk/libs/apr-util/configure.gnu - copied, changed from r4517, /freeswitch/private/packaging/libs/apr-util/configure.gnu Log: add configure.gnu in prep for rolling the core deps configure into the core configure. Copied: freeswitch/trunk/libs/apr-util/configure.gnu (from r4517, /freeswitch/private/packaging/libs/apr-util/configure.gnu) ============================================================================== --- /freeswitch/private/packaging/libs/apr-util/configure.gnu (original) +++ freeswitch/trunk/libs/apr-util/configure.gnu Sun Mar 11 01:17:54 2007 @@ -1,2 +1,2 @@ #! /bin/sh -./configure "$@" --with-apr=../apr +./configure "$@" --with-apr=../apr --disable-shared

1 0

[commit] r4517 - freeswitch/trunk/libs/srtp
by Freeswitch SVN 11 Mar '07

11 Mar '07

Author: mikej Date: Sun Mar 11 01:09:14 2007 New Revision: 4517 Added: freeswitch/trunk/libs/srtp/configure.gnu - copied unchanged from r4513, /freeswitch/private/packaging/libs/srtp/configure.gnu Log: add configure.gnu in prep for rolling the core deps configure into the core configure.

1 0