Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1361] trunk/configure.ac
|
From: <jpg...@us...> - 2008-02-29 17:37:45
|
Revision: 1361
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1361&view=rev
Author: jpgrayson
Date: 2008-02-29 09:37:47 -0800 (Fri, 29 Feb 2008)
Log Message:
-----------
Cleanup configure.ac by moving related constructs together.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-02-29 17:28:01 UTC (rev 1360)
+++ trunk/configure.ac 2008-02-29 17:37:47 UTC (rev 1361)
@@ -66,7 +66,6 @@
CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
-# AC_ARG_ENABLE saves the option's argument in enable_FEATURE
AC_ARG_ENABLE(local-gsm,
[AS_HELP_STRING([--enable-local-gsm],
[Use local gsm library [default=auto]])],,
@@ -104,24 +103,6 @@
[Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],,
with_ilbc="auto")
-case "$with_ilbc" in
- yes)
- enable_local_ilbc=yes ;;
- no)
- enable_local_ilbc=no ;;
- auto)
- AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
- if test -r lib/iLBC/iLBC_encode.c; then
- enable_local_ilbc=yes
- else
- enable_local_ilbc=no
- fi
- AC_MSG_RESULT([$enable_local_ilbc]) ;;
-
- *)
- AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
-esac
-
AC_ARG_WITH(wish,
[AS_HELP_STRING([--with-wish],
[Path to Tcl command language interpreter])],
@@ -149,6 +130,24 @@
FFMPEG="${with_ffmpeg}",
with_ffmpeg="no")
+case "$with_ilbc" in
+ yes)
+ enable_local_ilbc=yes ;;
+ no)
+ enable_local_ilbc=no ;;
+ auto)
+ AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
+ if test -r lib/iLBC/iLBC_encode.c; then
+ enable_local_ilbc=yes
+ else
+ enable_local_ilbc=no
+ fi
+ AC_MSG_RESULT([$enable_local_ilbc]) ;;
+
+ *)
+ AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
+esac
+
if test ! "x$enable_clients" = "xauto"; then
for client in ${enable_clients}; do
case "$client" in
@@ -166,8 +165,6 @@
done
fi
-AM_OPTIONS_WXCONFIG
-
case $host_os in
*mingw32*|*cygwin* )
OSTYPE=WIN32
@@ -195,6 +192,18 @@
obtain a copy.
]))
+PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
+ speex is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+]))
+
+PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([
+ speexdsp is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+]))
+
has_gsm=no
if test x$enable_local_gsm = xyes; then
has_gsm=yes
@@ -203,11 +212,6 @@
AM_PATH_GSM(has_gsm=yes, has_gsm=no)
fi
-if test x$enable_video = xyes; then
- AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support])
-fi
-AM_CONDITIONAL(VIDEO, test x$enable_video = xyes)
-
has_ogg=no
if test ! x$with_ogg = xno; then
PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes)
@@ -222,20 +226,7 @@
])
fi
fi
-AM_CONDITIONAL(OGG, test x$has_ogg = xyes)
-PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
- speex is required to build this package!
- please see http://www.xiph.org/ for how to
- obtain a copy.
-]))
-
-PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([
- speexdsp is required to build this package!
- please see http://www.xiph.org/ for how to
- obtain a copy.
-]))
-
has_theora=no
if test ! x$with_theora = xno; then
PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes)
@@ -250,7 +241,6 @@
])
fi
fi
-AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
has_vidcap=no
if test ! x$with_vidcap = xno; then
@@ -266,7 +256,6 @@
])
fi
fi
-AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
has_ffmpeg=no
if test ! x$with_ffmpeg = xno; then
@@ -282,7 +271,6 @@
])
fi
fi
-AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
@@ -303,6 +291,8 @@
IAX2_CONFIG=""
fi
+AM_OPTIONS_WXCONFIG
+
has_wx="no"
AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"],
[AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])])
@@ -359,23 +349,32 @@
CXXFLAGS="$save_CXXFLAGS"
dnl End wx xrc check
-AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
+if test x$enable_video = xyes; then
+ AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable video support])
+fi
+
if test x$use_echo_can = xspan; then
- AC_DEFINE(SPAN_EC, 1, [Span echo can])
+ AC_DEFINE(SPAN_EC, 1, [Define to 1 to enable span echo cancellation])
fi
if test x$use_echo_can = xspeex; then
- AC_DEFINE(SPEEX_EC, 1, [Speex echo can])
+ AC_DEFINE(SPEEX_EC, 1, [Define to 1 to enable speex echo cancellation])
fi
if test x$enable_local_ilbc = xyes; then
- AC_DEFINE(CODEC_ILBC,,[Enable ILBC support])
+ AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support])
fi
if test x$has_gsm = xyes && test ! x$with_gsm = xno; then
- AC_DEFINE(CODEC_GSM,,[Enable GSM support])
+ AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support])
fi
+AM_CONDITIONAL(VIDEO, test x$enable_video = xyes)
+AM_CONDITIONAL(OGG, test x$has_ogg = xyes)
+AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
+AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
+AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
+AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno)
AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes)
AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
