From ad55545669214eae7fad506e530bf315f873edbd Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 7 Feb 2008 23:55:24 +0000 Subject: [PATCH] voipcodecs configure tweaks, add to build system git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7548 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- bootstrap.sh | 2 +- configure.in | 1 + libs/voipcodecs/config-h.in | 235 ---------------------------------- libs/voipcodecs/configure.ac | 9 +- libs/voipcodecs/configure.gnu | 2 + 5 files changed, 8 insertions(+), 241 deletions(-) delete mode 100644 libs/voipcodecs/config-h.in create mode 100644 libs/voipcodecs/configure.gnu diff --git a/bootstrap.sh b/bootstrap.sh index 530dfe4eb3..aa4b4fa0db 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,7 +3,7 @@ echo "bootstrap: checking installation..." BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel \ +SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; diff --git a/configure.in b/configure.in index 3cf04ee3f3..0ea7681043 100644 --- a/configure.in +++ b/configure.in @@ -462,6 +462,7 @@ AC_CONFIG_SUBDIRS(libs/pcre) AC_CONFIG_SUBDIRS(libs/apr) AC_CONFIG_SUBDIRS(libs/apr-util) AC_CONFIG_SUBDIRS(libs/codec/g7xx) +AC_CONFIG_SUBDIRS(libs/voipcodecs) AC_CONFIG_SUBDIRS(libs/codec/gsm) AC_CONFIG_SUBDIRS(libs/codec/ilbc) AC_CONFIG_SUBDIRS(libs/codec/lpc10) diff --git a/libs/voipcodecs/config-h.in b/libs/voipcodecs/config-h.in deleted file mode 100644 index 0f5758e8e7..0000000000 --- a/libs/voipcodecs/config-h.in +++ /dev/null @@ -1,235 +0,0 @@ -/* config-h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_AUDIOFILE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FFTW3_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FFTW_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FLOAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_AUDIO_METER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_CARTESIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_DRAW_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_LIGHT_BUTTON_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FL_FL_OVERLAY_WINDOW_H - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - -/* Define to 1 if you have the `tiff' library (-ltiff). */ -#undef HAVE_LIBTIFF - -/* Define to 1 if you have the 'libxml2' library (-lxml2). */ -#undef HAVE_LIBXML2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBXML_PARSER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBXML_XINCLUDE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBXML_XMLMEMORY_H - -/* Define to 1 if the system has the type `long double'. */ -#undef HAVE_LONG_DOUBLE - -/* Define to 1 if the system has the type `long long'. */ -#undef HAVE_LONG_LONG - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MATH_H - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_PTHREAD_H - -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#undef HAVE_REALLOC - -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - -/* Define to 1 if you have the header file. */ -#undef HAVE_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_FCNTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TGMATH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIFFIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNICALL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_X11_X_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to the type of arg 1 for `select'. */ -#undef SELECT_TYPE_ARG1 - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#undef SELECT_TYPE_ARG234 - -/* Define to the type of arg 5 for `select'. */ -#undef SELECT_TYPE_ARG5 - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Version number of package */ -#undef VERSION - -/* Enable fixed point processing, where possible, instead of floating point */ -#undef VOIPCODECS_USE_FIXED_POINT - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - -/* Define to rpl_realloc if the replacement function should be used. */ -#undef realloc - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#undef volatile diff --git a/libs/voipcodecs/configure.ac b/libs/voipcodecs/configure.ac index df938b2f04..5e31290d12 100644 --- a/libs/voipcodecs/configure.ac +++ b/libs/voipcodecs/configure.ac @@ -242,14 +242,9 @@ then fi # Checks for libraries. -AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS) -AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS) -AC_CHECK_LIB([X11], [XOpenDisplay], TESTLIBS="$TESTLIBS -lX11",, $TESTLIBS) -AC_CHECK_LIB([tiff], [TIFFOpen], , AC_MSG_ERROR("Can't build without libtiff (does your system require a libtiff-devel package?)"), -lm) AC_CHECK_LIB([m], [cos]) AC_CHECK_LIB([m], [pow]) AC_CHECK_LIB([m], [sqrt]) -AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) TESTLIBS="$TESTLIBS -lxml2"]) if test -n "$enable_tests" ; then AC_LANG([C++]) AC_CHECK_LIB([fltk], [main], TESTLIBS="$TESTLIBS -lfltk -lsupc++") @@ -262,6 +257,10 @@ if test -n "$enable_tests" ; then AC_CHECK_LIB([pthread], [pthread_attr_init], TESTLIBS="$TESTLIBS -lpthread") AC_CHECK_LIB([dl], [dlopen], TESTLIBS="$TESTLIBS -ldl") AC_CHECK_LIB([unicall], [uc_start], TESTLIBS="$TESTLIBS -lunicall",, -ltiff -ldl) + AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS) + AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS) + AC_CHECK_LIB([X11], [XOpenDisplay], TESTLIBS="$TESTLIBS -lX11",, $TESTLIBS) + AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) TESTLIBS="$TESTLIBS -lxml2"]) fi case "${ax_cv_c_compiler_vendor}" in diff --git a/libs/voipcodecs/configure.gnu b/libs/voipcodecs/configure.gnu new file mode 100644 index 0000000000..dd7048bd67 --- /dev/null +++ b/libs/voipcodecs/configure.gnu @@ -0,0 +1,2 @@ +#! /bin/sh +./configure "$@" --disable-shared --with-pic