From d5eaa0bdc931df7a9bb91bb37a11386610eb4a1a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 28 Dec 2005 15:42:49 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@223 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 10 ++++-- Makefile.in | 9 +++-- buildlib.sh | 10 +++--- configure | 59 ++++++++++++++++--------------- src/mod/mod_sndfile/mod_sndfile.c | 3 +- 5 files changed, 52 insertions(+), 39 deletions(-) diff --git a/Makefile.am b/Makefile.am index e4045b4e84..ab063c5f3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,9 +87,15 @@ freeswitch_SOURCES = src/switch.c freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDFLAGS = -lfreeswitch -nodepends: + +.nodepends: touch .nodepends +nodepends: .nodepends + +yesdepends: + rm .nodepends + depends: ./buildlib.sh . install sqlite-3.2.8.tar.gz --disable-tcl --enable-threadsafe ./buildlib.sh . install apr-1.2.2.tar.gz @@ -104,7 +110,7 @@ modclean: -install_mod: +install_mod: modules @echo Installing $(NAME) @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db @/bin/cp -p ./$(NAME) $(PREFIX)/bin diff --git a/Makefile.in b/Makefile.in index 29216f9ac2..48dba709c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -943,9 +943,14 @@ uninstall-info: uninstall-info-recursive uninstall-libLTLIBRARIES uninstall-library_includeHEADERS -nodepends: +.nodepends: touch .nodepends +nodepends: .nodepends + +yesdepends: + rm .nodepends + depends: ./buildlib.sh . install sqlite-3.2.8.tar.gz --disable-tcl --enable-threadsafe ./buildlib.sh . install apr-1.2.2.tar.gz @@ -958,7 +963,7 @@ modules: $(NAME) modclean: @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done -install_mod: +install_mod: modules @echo Installing $(NAME) @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db @/bin/cp -p ./$(NAME) $(PREFIX)/bin diff --git a/buildlib.sh b/buildlib.sh index 1465935e2f..fe3b6a94f4 100755 --- a/buildlib.sh +++ b/buildlib.sh @@ -1,12 +1,14 @@ #!/bin/bash -if [ -f .nodepends ] ; then - exit 0 -fi - root=$1 shift +if [ -f $root/.nodepends ] ; then + echo "***depends disabled*** use make yesdepends to re-enable" + exit 0 +fi + + install= base=http://www.sofaswitch.com/mikej diff --git a/configure b/configure index d245f10739..6bad46ccf4 100755 --- a/configure +++ b/configure @@ -1043,7 +1043,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS]include additional configurations [automatic] + --with-tags[=TAGS] + include additional configurations [automatic] Some influential environment variables: CC C compiler command @@ -3689,7 +3690,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3692 "configure"' > conftest.$ac_ext + echo '#line 3693 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5268,7 +5269,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5271:" \ +echo "$as_me:5272:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6366,11 +6367,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6370: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6374: \$? = $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. @@ -6628,11 +6629,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6632: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6635: \$? = $ac_status" >&5 + echo "$as_me:6636: \$? = $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. @@ -6690,11 +6691,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6694: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6697: \$? = $ac_status" >&5 + echo "$as_me:6698: \$? = $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 @@ -8930,7 +8931,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11280: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11283: \$? = $ac_status" >&5 + echo "$as_me:11284: \$? = $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. @@ -11338,11 +11339,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11341: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11342: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11345: \$? = $ac_status" >&5 + echo "$as_me:11346: \$? = $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 @@ -12707,7 +12708,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13694: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13697: \$? = $ac_status" >&5 + echo "$as_me:13698: \$? = $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. @@ -13752,11 +13753,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13755: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13756: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13759: \$? = $ac_status" >&5 + echo "$as_me:13760: \$? = $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 @@ -15874,11 +15875,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15877: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15878: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15881: \$? = $ac_status" >&5 + echo "$as_me:15882: \$? = $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. @@ -16136,11 +16137,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16139: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16140: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16143: \$? = $ac_status" >&5 + echo "$as_me:16144: \$? = $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. @@ -16198,11 +16199,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16201: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16202: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16205: \$? = $ac_status" >&5 + echo "$as_me:16206: \$? = $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 @@ -18438,7 +18439,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <