Author: mikej Date: Thu Feb 7 18:55:24 2008 New Revision: 7548 Added: freeswitch/trunk/libs/voipcodecs/configure.gnu Removed: freeswitch/trunk/libs/voipcodecs/config-h.in Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/configure.in freeswitch/trunk/libs/voipcodecs/configure.ac Log: voipcodecs configure tweaks, add to build system Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Thu Feb 7 18:55:24 2008 @@ -3,7 +3,7 @@ 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"; Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Feb 7 18:55:24 2008 @@ -462,6 +462,7 @@ 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) Modified: freeswitch/trunk/libs/voipcodecs/configure.ac ============================================================================== --- freeswitch/trunk/libs/voipcodecs/configure.ac (original) +++ freeswitch/trunk/libs/voipcodecs/configure.ac Thu Feb 7 18:55:24 2008 @@ -242,14 +242,9 @@ 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 @@ 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 Added: freeswitch/trunk/libs/voipcodecs/configure.gnu ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/configure.gnu Thu Feb 7 18:55:24 2008 @@ -0,0 +1,2 @@ +#! /bin/sh +./configure "$@" --disable-shared --with-pic