add some libtool usage in openzap build. This will require re-bootstrap and configure

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@534 a93c3328-9c30-0410-af19-c9cd2b2d52af

libs/openzap/build/install-sh

+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2004-07-05.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

libs/openzap/configure.ac

@@ -5,14 +5,23 @@ AC_PREREQ(2.59)
 AC_INIT([openzap],[pre-alpha],[bugs@freeswitch.org])
 AC_CONFIG_SRCDIR([src/libteletone_detect.c])
 
+AC_CONFIG_AUX_DIR(build)
+#AM_INIT_AUTOMAKE(libopenzap,0.1)
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
 
 AC_PREFIX_DEFAULT(/usr/local/openzap)
 
+#override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)
+m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
+m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
+m4_defun([_LT_AC_LANG_RC_CONFIG], [:])
+#AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+
 # Check for com;iler type
 AC_DEFUN([AX_COMPILER_VENDOR],
 [
@@ -48,6 +57,40 @@ sun)
     ;;
 esac
 
+
+#set SOLINK variable based on compiler and host
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    SOLINK="-Bdynamic -dy -G"
+elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+    case "$host" in
+        *darwin*)
+            SOLINK="-dynamic -bundle -force-flat-namespace"
+        ;;
+        *-solaris2*)
+            SOLINK="-shared -Xlinker"
+        ;;
+        *)
+            SOLINK="-shared -Xlinker -x"
+        ;;
+    esac
+else
+    AC_ERROR([Please update configure.in with SOLINK values for your compiler])
+fi
+
+# set DYNAMIC_LIB_EXTEN
+# we should really be using libtool so we don't need to do this
+case "$host" in
+    *cygwin* | *mingw*)
+        DYNAMIC_LIB_EXTEN="dll"
+    ;;
+    *)
+        DYNAMIC_LIB_EXTEN="so"
+    ;;
+esac
+
+AC_SUBST(SOLINK)
+AC_SUBST(DYNAMIC_LIB_EXTEN)
+
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([m], [cos])

libs/openzap/src/detect_dtmf.c

@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
 	teletone_dtmf_detect_init (&dtmf_detect, 8000);
 
 	if ((fd = open(argv[1], O_RDONLY)) < 0) {
-		fprintf(stderr, "File Error!\n", strerror(errno));
+		fprintf(stderr, "File Error! [%s]\n", strerror(errno));
 		exit(-1);
 	}
 
@@ -28,5 +28,6 @@ int main(int argc, char *argv[])
 		}
 	}
 	close(fd);
+	return 0;
 }
 

libs/openzap/src/detect_tones.c

@@ -3,9 +3,8 @@
 
 int main(int argc, char *argv[])
 {
-	teletone_generation_session_t ts;
 	teletone_multi_tone_t mt = {0};
-	teletone_tone_map_t map = {0};
+	teletone_tone_map_t map = {{0}};
 
 	int fd, b;
 	short sln[512] = {0};
@@ -15,14 +14,12 @@ int main(int argc, char *argv[])
 		exit(-1);
 	}
 
-
 	map.freqs[0] = atof("350");
 	map.freqs[1] = atof("440");
 	teletone_multi_tone_init(&mt, &map);
 
-
 	if ((fd = open(argv[1], O_RDONLY)) < 0) {
-		fprintf(stderr, "File Error!\n", strerror(errno));
+		fprintf(stderr, "File Error! [%s]\n", strerror(errno));
 		exit(-1);
 	}
 
@@ -30,5 +27,6 @@ int main(int argc, char *argv[])
 		printf("TEST %d %d\n", b, teletone_multi_tone_detect(&mt, sln, b / 2));
 	}
 	close(fd);
+	return 0;
 }
 

libs/openzap/src/include/openzap.h

@@ -533,9 +533,9 @@ zap_status_t zap_fsk_demod_feed(zap_fsk_data_state_t *state, int16_t *data, size
 zap_status_t zap_fsk_demod_destroy(zap_fsk_data_state_t *state);
 int zap_fsk_demod_init(zap_fsk_data_state_t *state, int rate, uint8_t *buf, size_t bufsize);
 zap_status_t zap_fsk_data_init(zap_fsk_data_state_t *state, uint8_t *data, uint32_t datalen);
-zap_status_t zap_fsk_data_add_mdmf(zap_fsk_data_state_t *state, zap_mdmf_type_t type, uint8_t *data, uint32_t datalen);
+zap_status_t zap_fsk_data_add_mdmf(zap_fsk_data_state_t *state, zap_mdmf_type_t type, const uint8_t *data, uint32_t datalen);
 zap_status_t zap_fsk_data_add_checksum(zap_fsk_data_state_t *state);
-zap_status_t zap_fsk_data_add_sdmf(zap_fsk_data_state_t *state, char *date, char *number);
+zap_status_t zap_fsk_data_add_sdmf(zap_fsk_data_state_t *state, const char *date, char *number);
 zap_status_t zap_channel_outgoing_call(zap_channel_t *zchan);
 void zap_channel_rotate_tokens(zap_channel_t *zchan);
 void zap_channel_clear_detected_tones(zap_channel_t *zchan);

libs/openzap/src/testanalog.c

@@ -6,14 +6,14 @@ static void *test_call(zap_thread_t *me, void *obj)
 	zap_channel_t *chan = (zap_channel_t *) obj;
 	uint8_t frame[1024];
 	zap_size_t len;
-
+	char *number = strdup("5551212");
 
 	zap_sleep(10 * 1000);
 	
 	zap_log(ZAP_LOG_DEBUG, "answer call and start echo test\n");
 
 	zap_set_state_locked(chan, ZAP_CHANNEL_STATE_UP);
-	zap_channel_command(chan, ZAP_COMMAND_SEND_DTMF, "5551212");
+	zap_channel_command(chan, ZAP_COMMAND_SEND_DTMF, number);
 
 	while (chan->state == ZAP_CHANNEL_STATE_UP) {
 		zap_wait_flag_t flags = ZAP_READ;
@@ -37,8 +37,8 @@ static void *test_call(zap_thread_t *me, void *obj)
 	}
 
 	zap_log(ZAP_LOG_DEBUG, "call over\n");
-
-	return 0;
+	free(number);
+	return NULL;
 }
 
 static ZIO_SIGNAL_CB_FUNCTION(on_signal)
@@ -59,12 +59,14 @@ static ZIO_SIGNAL_CB_FUNCTION(on_signal)
 }
 
 static int R = 0;
+#if 0
 static void handle_SIGINT(int sig)
 {
 	if (sig);
 	R = 0;
 	return;
 }
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -113,7 +115,7 @@ int main(int argc, char *argv[])
 done:
 
 	zap_global_destroy();
-
+	return 0;
 }
 
 /* For Emacs:

libs/openzap/src/testapp.c

@@ -67,10 +67,8 @@ int main(int argc, char *argv[])
 		goto top;
 	}
 
- end:
-
 	zap_global_destroy();
-
+	return 0;
 }
 
 /* For Emacs:

libs/openzap/src/testboost.c

@@ -6,13 +6,14 @@ static ZIO_SIGNAL_CB_FUNCTION(on_signal)
 }
 
 static int R = 0;
+#if 0
 static void handle_SIGINT(int sig)
 {
 	if (sig);
 	R = 0;
 	return;
 }
-
+#endif
 int main(int argc, char *argv[])
 {
 	zap_span_t *span;
@@ -59,6 +60,7 @@ int main(int argc, char *argv[])
 
 	zap_global_destroy();
 
+	return 0;
 }
 
 /* For Emacs:

libs/openzap/src/testcid.c

 #include "openzap.h"
+zap_status_t my_write_sample(int16_t *buf, zap_size_t buflen, void *user_data);
 
 struct helper {
 	int fd;
@@ -7,8 +8,6 @@ struct helper {
 
 zap_status_t my_write_sample(int16_t *buf, zap_size_t buflen, void *user_data)
 {
-	int x ;
-
 	struct helper *foo = (struct helper *) user_data;
 	write(foo->fd, buf, buflen * 2);
 	foo->wrote += buflen * 2;
@@ -28,17 +27,17 @@ int main(int argc, char *argv[])
 	char fbuf[256];
 	uint8_t databuf[1024] = "";
 	struct helper foo = {0};
-	int x, bytes, start_bits = 180, stop_bits = 5, sbits = 300;
+	//	int x, bytes, start_bits = 180, stop_bits = 5, sbits = 300;
 	char time_str[9];
 	struct tm tm;
 	time_t now;
 	
 	if (argc < 2) {
 		int x;
-		char *url = "sip:cool@rad.com";
+		const char *url = "sip:cool@rad.com";
 
 		if ((fd = open("tone.raw", O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR)) < 0) {
-			fprintf(stderr, "File Error!\n", strerror(errno));
+			fprintf(stderr, "File Error! [%s]\n", strerror(errno));
 			exit(-1);
 		}
 
@@ -103,4 +102,5 @@ int main(int argc, char *argv[])
 	zap_fsk_demod_destroy(&fsk_data);
 
 	close(fd);
+	return 0;
 }

libs/openzap/src/testisdn.c

@@ -58,6 +58,8 @@ int main(int argc, char *argv[])
 
 	zap_global_destroy();
 
+	return 1;
+
 }
 
 /* For Emacs:

libs/openzap/src/testtones.c

@@ -26,18 +26,18 @@ int main(int argc, char *argv[])
 	}
 
 	if ((tmp.fd = open(argv[1], O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR)) < 0) {
-		fprintf(stderr, "File Error!\n", strerror(errno));
+		fprintf(stderr, "File Error! [%s]\n", strerror(errno));
 		exit(-1);
 	}
 
-	
-
 	teletone_init_session(&ts, 0, teletone_handler, &tmp);
 	ts.rate = 8000;
 	ts.debug = 1;
 	ts.debug_stream = stdout;
 	teletone_run(&ts, argv[2]);
 	close(tmp.fd);
+
+	return 0;
 }
 #else 
 int32_t main(int argc, char *argv[])

libs/openzap/src/zap_callerid.c

@@ -47,7 +47,7 @@ zap_status_t zap_fsk_data_init(zap_fsk_data_state_t *state, uint8_t *data, uint3
 	return ZAP_SUCCESS;
 }
 
-zap_status_t zap_fsk_data_add_sdmf(zap_fsk_data_state_t *state, char *date, char *number)
+zap_status_t zap_fsk_data_add_sdmf(zap_fsk_data_state_t *state, const char *date, char *number)
 {
 	size_t dlen = strlen(date);
 	size_t nlen = strlen(number);
@@ -61,7 +61,7 @@ zap_status_t zap_fsk_data_add_sdmf(zap_fsk_data_state_t *state, char *date, char
 	return ZAP_SUCCESS;
 }
 
-zap_status_t zap_fsk_data_add_mdmf(zap_fsk_data_state_t *state, zap_mdmf_type_t type, uint8_t *data, uint32_t datalen)
+zap_status_t zap_fsk_data_add_mdmf(zap_fsk_data_state_t *state, zap_mdmf_type_t type, const uint8_t *data, uint32_t datalen)
 {
 	state->buf[0] = ZAP_CID_TYPE_MDMF;
 	state->buf[state->bpos++] = type;