- autoconf build system,

- cleanups in C code



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@128 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

p2pproxy/INSTALL

+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

p2pproxy/Makefile.am

+EXTRA_DIST=dependencies dependencies-src src test-src
+
+SUBDIRS=launcher
+
+antbuild/dist/p2pproxy_0.1/p2pproxy.jar:	src/org/linphone/p2pproxy/*/*.java
+	$(ANT) dist
+
+jarsdir=$(datadir)/java/fonis
+
+jars_DATA=antbuild/dist/p2pproxy_0.1/p2pproxy.jar antbuild/dist/p2pproxy_0.1/*.jar
+

p2pproxy/autogen.sh

+#!/bin/sh
+
+#AM_VERSION=1.10
+#1.9 was the recommended version
+if test -n "$AM_VERSION" ; then
+	ACLOCAL=aclocal-${AM_VERSION}
+	AUTOMAKE=automake-${AM_VERSION}
+else
+	ACLOCAL=aclocal
+	AUTOMAKE=automake
+fi
+
+echo "Generating build scripts in this mediastreamer plugin"
+set -x
+libtoolize --copy --force
+$ACLOCAL
+$AUTOMAKE --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+

p2pproxy/configure.ac

+dnl Process this file with autoconf to produce a configure script.
+AC_INIT([p2pproxy],[0.0.1])
+
+AM_INIT_AUTOMAKE([tar-ustar])
+
+AC_CANONICAL_SYSTEM
+
+AC_MSG_CHECKING([warning make an error on compilation])
+AC_ARG_ENABLE(strict,
+[  --enable-strict       Enable error on compilation warning [default=no]],
+[wall_werror=$enableval],
+[wall_werror=no]
+)
+
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+
+
+CFLAGS="$CFLAGS -Wall"
+
+
+dnl Checks for header files.
+AC_HEADER_STDC
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_HEADER_TIME
+AC_WORDS_BIGENDIAN
+if test x$ac_cv_c_bigendian = xyes ; then
+	CFLAGS="$CFLAGS -D_BIGENDIAN"
+fi
+
+if test $GCC = yes && test $wall_werror = yes;  then
+	CFLAGS="$CFLAGS -Werror "
+fi
+
+AC_ARG_WITH(java,
+		[  --with-java	Sets directory of java home,  [default=/usr/lib/jvm/java-1.5.0-sun] ],
+		[ javadir=${withval}],[javadir=/usr/lib/jvm/java-1.5.0-sun/])
+
+AC_SUBST(javadir)
+
+AC_PATH_PROG(ANT,ant,false)
+
+if test x$ANT = xfalse ; then
+	AC_MSG_ERROR([ant not found: you must install ant to build this package.])
+fi
+
+if test x$prefix = xNONE ; then
+	jarsdir="/usr/local/share/java/fonis"
+else
+	jarsdir="$prefix/share/java/fonis"
+fi
+
+AC_DEFINE_UNQUOTED(P2PPROXY_INSTALLDIR,"$jarsdir",[path of jars])
+
+dnl ##################################################
+dnl # Check for ESP Packager
+dnl ##################################################
+
+AC_PATH_PROG(EPM,epm,false)
+AC_PATH_PROG(MKEPMLIST,mkepmlist,false)
+AC_PATH_PROG(EPMINSTALL,epminstall,false)
+AM_CONDITIONAL(WITH_EPM,test $EPM != false && test $MKEPMLIST != false && test $EPMINSTALL != false)
+
+
+# Preferred packaging system, as per EPM terminology
+case $target in
+*-*-linux*)
+	if test -f /etc/debian_version ; then
+		EPM_PKG_EXT=deb
+	else
+     		EPM_PKG_EXT=rpm
+     	fi
+     	;;
+*-hp-hpux*)
+     	EPM_PKG_EXT=depot.gz;;
+*-dec-osf*)
+	EPM_PKG_EXT=setld;;
+esac
+AC_SUBST(EPM_PKG_EXT)
+
+# System software User & Group names
+case $target in
+*-*-linux*)
+	SYS_USER=root
+	SYS_GROUP=root
+	;;
+*-*-hpux*|*-dec-osf*)
+	SYS_USER=bin
+	SYS_GROUP=bin
+	;;
+esac
+AC_SUBST(SYS_USER)
+AC_SUBST(SYS_GROUP)
+
+# CPU Architecture
+case $target_cpu in
+i?86)		ARCH=i386;;
+*)		ARCH=$target_cpu;;
+esac
+AC_SUBST(ARCH)
+
+# Various other packaging variables, that can be over-ridden ad `make
+# package' time
+SUMMARY="A SIP P2P proxy and toolkit"
+AC_SUBST(SUMMARY)
+PACKAGER=anonymous
+AC_SUBST(PACKAGER)
+LICENSE=GPL
+AC_SUBST(LICENSE)
+VENDOR=Linphone
+AC_SUBST(VENDOR)
+RELEASE=1
+AC_SUBST(RELEASE)
+
+
+AC_OUTPUT(
+Makefile
+launcher/Makefile
+launcher/src/Makefile
+)

p2pproxy/launcher/Makefile.am

+SUBDIRS=src

p2pproxy/launcher/src/Makefile.am

+JAVA_LIBS=-L$(javadir)/jre/lib/amd64 -L$(javadir)/jre/lib/i386 \
+			-L$(javadir)/jre/lib/amd64/server -L$(javadir)/jre/lib/i386/server -ljvm 
+
+JAVA_LDFLAGS=\
+	-Wl,-rpath,$(javadir)/jre/lib/amd64 -Wl,-rpath,$(javadir)/jre/lib/i386 \
+	-Wl,-rpath,$(javadir)/jre/lib/amd64/server -Wl,-rpath,$(javadir)/jre/lib/i386/server
+
+lib_LTLIBRARIES=libfonis.la
+
+libfonis_la_SOURCES=p2pproxy.c p2pproxy.h
+
+libfonis_la_LIBADD=$(JAVA_LIBS)
+
+libfonis_la_LDFLAGS=$(JAVA_LDFLAGS)
+
+noinst_PROGRAMS=launcher-tester
+
+launcher_tester_SOURCES=launcher-tester.c
+
+launcher_tester_LDADD=libfonis.la $(JAVA_LIBS)
+
+launcher_tester_LDFLAGS=$(JAVA_LDFLAGS)
+
+INCLUDES=-I$(javadir)/include -I$(javadir)/include/linux

p2pproxy/launcher/src/launcher-tester.c

@@ -57,4 +57,4 @@ int main(int argc, char **argv) {
 	p2pproxy_application_stop();
 	pthread_join(th,NULL);
 	return 0;
-}
\ No newline at end of file
+}

p2pproxy/launcher/src/p2pproxy.c

@@ -7,19 +7,19 @@
 	#define P2PPROXY_JMX_PORT "5678"
 #endif
 #ifndef P2PPROXY_INSTALLDIR
-	#define P2PPROXY_INSTALLDIR "/usr/local/share/java"
+	#define P2PPROXY_INSTALLDIR "/usr/share/java/fonis"
 #endif 
 #ifndef P2PPROXY_BUILDDIR
 	#define P2PPROXY_BUILDDIR "../antbuild/dist/p2pproxy_0.1"
 #endif
 #define NUMBER_OF_OPTION 7
-JavaVM* p2pproxy_application_jvm = 0;
+JavaVM *p2pproxy_application_jvm = 0;
 
 #define GET_JNI_ENV \
 	jint lResult = 0 ;\
-	JNIEnv* lJniEnv = 0;\
+	JNIEnv *lJniEnv = 0;\
 	jclass  lMainClass = 0;\
-	lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,&lJniEnv,NULL);\
+	lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,(void**)&lJniEnv,NULL);\
 	if (lResult != 0) { \
 		fprintf(stderr,"cannot attach VM\n");\
 		return P2PPROXY_ERROR;\
@@ -32,9 +32,8 @@ JavaVM* p2pproxy_application_jvm = 0;
 
 
 int p2pproxy_application_start(int argc, char **argv) {
-	JNIEnv* lJniEnv = 0;
+	JNIEnv *lJniEnv = 0;
 	jclass  lMainClass = 0;
-	
 	JavaVMInitArgs args;
 	JavaVMOption options[NUMBER_OF_OPTION];
 	jint res=-1;
@@ -69,15 +68,14 @@ int p2pproxy_application_start(int argc, char **argv) {
 
 	args.nOptions = NUMBER_OF_OPTION;
 	args.options = options;
-	args.ignoreUnrecognized = JNI_FALSE;	int lResult;
+	args.ignoreUnrecognized = JNI_FALSE;
 	
 
-	res = JNI_CreateJavaVM(&p2pproxy_application_jvm, (void **)&lJniEnv, &args);
+	res = JNI_CreateJavaVM(&p2pproxy_application_jvm,  (void**)& lJniEnv, &args);
 	if (res < 0) {
 		fprintf(stderr,"cannot start p2pproxy vm [%i]",res);
 		return P2PPROXY_ERROR;
 	}
-
 	lMainClass = (*lJniEnv)->FindClass(lJniEnv, "org/linphone/p2pproxy/core/P2pProxyMain");
 
 	if (lMainClass == 0) {
@@ -143,7 +141,7 @@ int p2pproxy_accountmgt_deleteAccount(const char* user_name) {
 int p2pproxy_resourcemgt_lookup_sip_proxy(char* proxy_uri,size_t size, char* domaine) {
 	jmethodID lLookupSipProxyUriMethod;
 	jstring lJStringResult; 
-	const jbyte* lString;
+	const char* lString;
 	jboolean  lIsCopy;
 	jstring applicationArg;
 	
@@ -184,15 +182,15 @@ int p2pproxy_application_get_state() {
 	return lResult;
 	
 }
-void p2pproxy_application_stop() {
+
+int p2pproxy_application_stop() {
 	jmethodID stopMethod = 0;
 	GET_JNI_ENV
 	
 	stopMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "stop", "()V");
 	(*lJniEnv)->CallStaticVoidMethod(lJniEnv, lMainClass, stopMethod);
 	(*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm);
-	return;
-
+	return 0;
 }
 
 

p2pproxy/launcher/src/p2pproxy.h

@@ -59,13 +59,13 @@ int p2pproxy_application_start(int argc, char **argv);
  * 	@return P2PPROXY_CONNECTED, P2PPROXY_NOT_ERROR
  * 
  */
-int p2pproxy_application_get_state();
+int p2pproxy_application_get_state(void);
 
 /**
  *  stop p2pproxy application
  * 
  */
-void p2pproxy_application_stop();
+int p2pproxy_application_stop(void);
 
 /**
  * return the status string corresponding to the status code