From: <jpg...@us...> - 2007-07-02 20:40:30
|
Revision: 1050 http://svn.sourceforge.net/iaxclient/?rev=1050&view=rev Author: jpgrayson Date: 2007-07-02 13:40:30 -0700 (Mon, 02 Jul 2007) Log Message: ----------- Invoke PKG_CHECK_MODULES correctly for gtk+-2.0. Improve automatic client detection. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-07-02 19:58:17 UTC (rev 1049) +++ trunk/configure.ac 2007-07-02 20:40:30 UTC (rev 1050) @@ -196,7 +196,7 @@ ])) PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) -PKG_CHECK_MODULES(GTK2, [gtk >= 2.0], has_gtk2=yes, has_gtk2=no) +PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) @@ -307,7 +307,10 @@ clients="$clients testcall" if test ! x$has_wx = xno; then - clients="$clients iaxphone wx" + clients="$clients iaxphone" + if test "x$has_gdk2" = xyes; then + clients="$clients wx" + fi if test x$has_wx_xrc = xyes; then clients="$clients iaxcomm" @@ -322,7 +325,7 @@ clients="$clients WinIAX" fi - if test ! x$WISH = x; then + if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then clients="$clients tkphone" fi fi @@ -346,6 +349,12 @@ CLIENTS="$CLIENTS $client";; tkphone) + if ! test "x$has_gtk2" = "xyes"; then + AC_MSG_ERROR([tkphone requires GTK2]) + fi + if ! test "x$has_gdk2" = "xyes"; then + AC_MSG_ERROR([tkphone requires GDK2]) + fi CLIENTS="$CLIENTS $client";; WinIAX) @@ -355,6 +364,9 @@ if test "x$has_wx" = "xno"; then AC_MSG_ERROR([wx client requires wxWidgets]) fi + if ! test "x$has_gtk2" = "xyes"; then + AC_MSG_ERROR([wx client requires GTK2]) + fi if ! test "x$has_gdk2" = "xyes"; then AC_MSG_ERROR([wx client requires GDK2]) fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2007-08-16 14:04:54
|
Revision: 1097 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1097&view=rev Author: jpgrayson Date: 2007-08-16 07:04:43 -0700 (Thu, 16 Aug 2007) Log Message: ----------- Make trunk version 2.1-svn to differentiate it from the 2.0 branch. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-08-16 14:03:27 UTC (rev 1096) +++ trunk/configure.ac 2007-08-16 14:04:43 UTC (rev 1097) @@ -3,12 +3,9 @@ AC_PREREQ(2.59) dnl Package version -m4_define(IAXC_MAJOR, [2]) -m4_define(IAXC_MINOR, [0]) -m4_define(IAXC_MICRO, [0]) -m4_define(IAXC_EXTRA, [-svn]) +m4_define(IAXC_VERSION, [2.1-svn]) -AC_INIT(iaxclient, IAXC_MAJOR.IAXC_MINOR.IAXC_MICRO[]IAXC_EXTRA, [jpg...@gm...]) +AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) AC_CONFIG_SRCDIR([lib/iaxclient.h]) AC_CONFIG_HEADERS([config.h]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2007-08-28 19:54:14
|
Revision: 1110 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1110&view=rev Author: jpgrayson Date: 2007-08-28 12:54:16 -0700 (Tue, 28 Aug 2007) Log Message: ----------- Fix problem with gsm always being disabled. Thanks to Mikael Magnusson. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-08-28 15:56:53 UTC (rev 1109) +++ trunk/configure.ac 2007-08-28 19:54:16 UTC (rev 1110) @@ -287,11 +287,11 @@ AC_DEFINE(CODEC_ILBC,,[Enable ILBC support]) fi -if test x$has_gsm = xyes && test ! x$with_gsmlibraries != xno; then +if test x$has_gsm = xyes && test ! x$with_gsm = xno; then AC_DEFINE(CODEC_GSM,,[Enable GSM support]) fi -AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsmlibraries != xno) +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) AM_CONDITIONAL(USE_LOCAL_ILBC, test x$enable_local_ilbc = xyes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2007-08-31 07:27:16
|
Revision: 1107 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1107&view=rev Author: jpgrayson Date: 2007-08-28 08:53:45 -0700 (Tue, 28 Aug 2007) Log Message: ----------- Rename pkg-config variable prefix GTK2 to GTK. Fixes build problems in GTK clients. Thanks to Mikael Magnusson for this patch. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-08-27 21:59:46 UTC (rev 1106) +++ trunk/configure.ac 2007-08-28 15:53:45 UTC (rev 1107) @@ -193,7 +193,7 @@ ])) PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) -PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) +PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2007-09-05 22:36:50
|
Revision: 1115 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1115&view=rev Author: jpgrayson Date: 2007-09-05 15:36:52 -0700 (Wed, 05 Sep 2007) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-09-03 19:21:53 UTC (rev 1114) +++ trunk/configure.ac 2007-09-05 22:36:52 UTC (rev 1115) @@ -216,7 +216,7 @@ obtain a copy. ])) -has_teora=no +has_theora=no if test ! x$with_theora = xno; then PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) if test x$has_theora = xyes; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2007-11-08 14:52:37
|
Revision: 1274 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1274&view=rev Author: jpgrayson Date: 2007-11-08 06:52:32 -0800 (Thu, 08 Nov 2007) Log Message: ----------- When automatically choosing the clients at configure-time, only build stresstest if oggz and theora are available. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-11-07 18:00:18 UTC (rev 1273) +++ trunk/configure.ac 2007-11-08 14:52:32 UTC (rev 1274) @@ -385,8 +385,12 @@ # Autodetect clients if test "x$enable_clients" = "xauto"; then - clients="$clients testcall stresstest" + clients="$clients testcall" + if test x$has_oggz = xyes && test x$has_theora = xyes; then + clients="$clients stresstest" + fi + if test ! x$has_wx = xno; then clients="$clients iaxphone" if test "x$has_gdk2" = xyes; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:43:03
|
Revision: 1356 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1356&view=rev Author: sbalea Date: 2008-02-26 11:43:03 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Increase libtool and package version in configure.ac Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-26 19:41:09 UTC (rev 1355) +++ trunk/configure.ac 2008-02-26 19:43:03 UTC (rev 1356) @@ -3,7 +3,7 @@ AC_PREREQ(2.59) dnl Package version -m4_define(IAXC_VERSION, [2.1-svn]) +m4_define(IAXC_VERSION, [2.x-trunk]) AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) @@ -15,7 +15,7 @@ dnl Libtool library version IAXC_LT_CURRENT=1 -IAXC_LT_REVISION=0 +IAXC_LT_REVISION=2 IAXC_LT_AGE=0 AC_SUBST(IAXC_LT_CURRENT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:24:37
|
Revision: 1359 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1359&view=rev Author: jpgrayson Date: 2008-02-29 09:24:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change email address to something more generic to the project. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:19:56 UTC (rev 1358) +++ trunk/configure.ac 2008-02-29 17:24:41 UTC (rev 1359) @@ -5,7 +5,7 @@ dnl Package version m4_define(IAXC_VERSION, [2.x-trunk]) -AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) +AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...]) AC_CONFIG_SRCDIR([lib/iaxclient.h]) AC_CONFIG_HEADERS([config.h]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:27:57
|
Revision: 1360 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1360&view=rev Author: jpgrayson Date: 2008-02-29 09:28:01 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change configure option "--with-video" to more conventional "--enable-video". Video can now be disabled with either of: --enable-video=no --disable-video Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:24:41 UTC (rev 1359) +++ trunk/configure.ac 2008-02-29 17:28:01 UTC (rev 1360) @@ -83,6 +83,11 @@ enable_debug_iax2=$enableval, enable_debug_iax2="no") +AC_ARG_ENABLE(video, + [AS_HELP_STRING([--enable-video], + [Enable video support [default=yes]])],, + [enable_video="yes"]) + AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], [use echo can (span or speex) [default=speex]])], @@ -123,11 +128,6 @@ WISH="${with_wish}", with_wish="auto") -AC_ARG_WITH(video, - [AS_HELP_STRING([--without-video], - [Video support])],, - with_video="yes") - AC_ARG_WITH(ogg, [AS_HELP_STRING([--without-ogg], [OGG support])],, @@ -203,10 +203,10 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_video = xyes; then +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$with_video = xyes) +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) has_ogg=no if test ! x$with_ogg = xno; then @@ -404,7 +404,7 @@ fi fi - if test x$has_sdl = xyes && test x$with_video = xyes; then + if test x$has_sdl = xyes && test x$enable_video = xyes; then clients="$clients vtestcall" fi @@ -427,7 +427,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then + if test ! x$has_sdl = xyes || test ! x$enable_video = xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <jpg...@us...> - 2008-02-29 17:54:33
|
Revision: 1362 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1362&view=rev Author: jpgrayson Date: 2008-02-29 09:54:33 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Move all of the client configuration business to the same place. Only build stresstest if video is enabled (since it depends on it). Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:37:47 UTC (rev 1361) +++ trunk/configure.ac 2008-02-29 17:54:33 UTC (rev 1362) @@ -148,23 +148,6 @@ 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 - iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) - clients="$clients $client" ;; - all | yes) - clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" - break ;; - none | no) - clients="" - break ;; - *) - AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; - esac - done -fi - case $host_os in *mingw32*|*cygwin* ) OSTYPE=WIN32 @@ -385,10 +368,25 @@ AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX) # Autodetect clients -if test "x$enable_clients" = "xauto"; then +if test "x$enable_clients" != "xauto"; then + for client in ${enable_clients}; do + case "$client" in + iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) + clients="$clients $client" ;; + all | yes) + clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" + break ;; + none | no) + clients="" + break ;; + *) + AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; + esac + done +else clients="$clients testcall" - if test x$has_oggz = xyes && test x$has_theora = xyes; then + if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then clients="$clients stresstest" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 18:02:38
|
Revision: 1363 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1363&view=rev Author: jpgrayson Date: 2008-02-29 10:02:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Group PKG_CHECK_MODULES() invocations together. Use PKG_CHECK_MODULES() unconditionally for ogg, theora, etc. Fix related indentation. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:54:33 UTC (rev 1362) +++ trunk/configure.ac 2008-02-29 18:02:41 UTC (rev 1363) @@ -187,6 +187,16 @@ obtain a copy. ])) +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) +PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) +PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) +PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no) +PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no) +PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no) +PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no) +PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no) + has_gsm=no if test x$enable_local_gsm = xyes; then has_gsm=yes @@ -195,39 +205,33 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -has_ogg=no if test ! x$with_ogg = xno; then -PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes) -if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" -elif test ! x$with_ogg = xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test ! x$with_ogg = xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi -has_theora=no if test ! x$with_theora = xno; then -PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) -if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" -elif test ! x$with_theora = xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test ! x$with_theora = xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi -has_vidcap=no if test ! x$with_vidcap = xno; then - PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes) if test x$has_vidcap = xyes; then AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) PKG_REQUIRES="$PKG_REQUIRES vidcap" @@ -240,27 +244,19 @@ fi fi -has_ffmpeg=no if test ! x$with_ffmpeg = xno; then -PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes) -if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" -elif test ! x$with_ffmpeg = xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test ! x$with_ffmpeg = xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi fi -fi -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) -PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) -PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) -PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no) - has_iax2=no if test ! x$enable_local_iax = xyes; then AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 18:06:14
|
Revision: 1364 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1364&view=rev Author: jpgrayson Date: 2008-02-29 10:06:18 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change instances of "test ! xxx = yyy" to "test xxx != yyy". Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 18:02:41 UTC (rev 1363) +++ trunk/configure.ac 2008-02-29 18:06:18 UTC (rev 1364) @@ -205,11 +205,11 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test ! x$with_ogg = xno; then +if test x$with_ogg != xno; then if test x$has_ogg = xyes; then AC_DEFINE(USE_OGG, 1, [OGG]) PKG_REQUIRES="$PKG_REQUIRES ogg" - elif test ! x$with_ogg = xauto ; then + elif test x$with_ogg != xauto ; then AC_MSG_ERROR([ libogg is required to build this package! please see http://www.xiph.org/ for how to @@ -218,11 +218,11 @@ fi fi -if test ! x$with_theora = xno; then +if test x$with_theora != xno; then if test x$has_theora = xyes; then AC_DEFINE(USE_THEORA, 1, [THEORA]) PKG_REQUIRES="$PKG_REQUIRES theora" - elif test ! x$with_theora = xauto ; then + elif test x$with_theora != xauto ; then AC_MSG_ERROR([ libtheora is required to build this package! please see http://www.xiph.org/ for how to @@ -231,11 +231,11 @@ fi fi -if test ! x$with_vidcap = xno; then +if test x$with_vidcap != xno; then if test x$has_vidcap = xyes; then AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test ! x$with_vidcap = xauto ; then + elif test x$with_vidcap != xauto ; then AC_MSG_ERROR([ libvidcap is required to build this package! please see http://libvidcap.sourceforge.net/ for how to @@ -244,11 +244,11 @@ fi fi -if test ! x$with_ffmpeg = xno; then +if test x$with_ffmpeg != xno; then if test x$has_ffmpeg = xyes; then AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) PKG_REQUIRES="$PKG_REQUIRES ffmpeg" - elif test ! x$with_ffmpeg = xauto ; then + elif test x$with_ffmpeg != xauto ; then AC_MSG_ERROR([ FFmpeg is required to build this package! please see http://ffmpeg.mplayerhq.hu/ for how to @@ -258,11 +258,11 @@ fi has_iax2=no -if test ! x$enable_local_iax = xyes; then +if test x$enable_local_iax != xyes; then AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no) fi -if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then +if test x$has_iax2 = xno && test x$enable_local_iax != xno; then has_iax2=yes enable_local_iax2=yes IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX' @@ -286,7 +286,7 @@ CXXFLAGS="$WX_CXXFLAGS_ONLY" AC_LANG_PUSH(C++) -if test ! x$has_wx = xno; then +if test x$has_wx != xno; then AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes, [AC_MSG_WARN([Can't find wx/xrc/xml.h]) has_wx_xrc=no]) @@ -344,7 +344,7 @@ AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support]) fi -if test x$has_gsm = xyes && test ! x$with_gsm = xno; then +if test x$has_gsm = xyes && test x$with_gsm != xno; then AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support]) fi @@ -354,7 +354,7 @@ 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_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) AM_CONDITIONAL(USE_DEBUG_IAX2, test x$enable_debug_iax2 = xyes) @@ -386,7 +386,7 @@ clients="$clients stresstest" fi - if test ! x$has_wx = xno; then + if test x$has_wx != xno; then clients="$clients iaxphone" if test "x$has_gdk2" = xyes; then clients="$clients wx" @@ -405,7 +405,7 @@ clients="$clients WinIAX" fi - if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then + if test x$WISH != x && test "x$has_gdk2" = "xyes"; then clients="$clients tkphone" fi fi @@ -420,7 +420,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$enable_video = xyes ; then + if test x$has_sdl != xyes || test x$enable_video != xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 18:16:02
|
Revision: 1365 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1365&view=rev Author: jpgrayson Date: 2008-02-29 10:16:07 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Only demand vidcap, theora, ogg, and ffmpeg if video is enabled. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 18:06:18 UTC (rev 1364) +++ trunk/configure.ac 2008-02-29 18:16:07 UTC (rev 1365) @@ -205,55 +205,58 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_ogg != xno; then - if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" - elif test x$with_ogg != xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) +if test x$enable_video = xyes; then + + if test x$with_ogg != xno; then + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test x$with_ogg != xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_theora != xno; then - if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" - elif test x$with_theora != xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + + if test x$with_theora != xno; then + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test x$with_theora != xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_vidcap != xno; then - if test x$has_vidcap = xyes; then - AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) - PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test x$with_vidcap != xauto ; then - AC_MSG_ERROR([ - libvidcap is required to build this package! - please see http://libvidcap.sourceforge.net/ for how to - obtain a copy. - ]) + + if test x$with_vidcap != xno; then + if test x$has_vidcap = xyes; then + AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) + PKG_REQUIRES="$PKG_REQUIRES vidcap" + elif test x$with_vidcap != xauto ; then + AC_MSG_ERROR([ + libvidcap is required to build this package! + please see http://libvidcap.sourceforge.net/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_ffmpeg != xno; then - if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" - elif test x$with_ffmpeg != xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) + + if test x$with_ffmpeg != xno; then + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test x$with_ffmpeg != xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-03-25 20:12:04
|
Revision: 1378 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1378&view=rev Author: jpgrayson Date: 2008-03-25 13:12:06 -0700 (Tue, 25 Mar 2008) Log Message: ----------- When video is enabled, require libvidcap. Otherwise errors can show up at compile time. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-03-23 13:54:26 UTC (rev 1377) +++ trunk/configure.ac 2008-03-25 20:12:06 UTC (rev 1378) @@ -79,8 +79,8 @@ AC_ARG_ENABLE(debug-iax, [AS_HELP_STRING([--enable-debug-iax], [Enable debug support in local iax library])], - enable_debug_iax2=$enableval, - enable_debug_iax2="no") + enable_debug_iax2=$enableval, + enable_debug_iax2="no") AC_ARG_ENABLE(video, [AS_HELP_STRING([--enable-video], @@ -233,17 +233,15 @@ fi fi - if test x$with_vidcap != xno; then - if test x$has_vidcap = xyes; then - AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) - PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test x$with_vidcap != xauto ; then - AC_MSG_ERROR([ - libvidcap is required to build this package! - please see http://libvidcap.sourceforge.net/ for how to - obtain a copy. - ]) - fi + if test x$has_vidcap = xyes; then + AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) + PKG_REQUIRES="$PKG_REQUIRES vidcap" + else + AC_MSG_ERROR([ + libvidcap is required to build this package! + please see http://libvidcap.sourceforge.net/ for how to + obtain a copy. + ]) fi if test x$with_ffmpeg != xno; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-04-15 22:13:21
|
Revision: 1402 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1402&view=rev Author: jpgrayson Date: 2008-04-15 15:13:27 -0700 (Tue, 15 Apr 2008) Log Message: ----------- Make the AM_CONDITIONAL also be conditional on the "with_xxx". The primary benefit of this change is that --without-ffmpeg will work as expected even if libavcodec.pc and friends are installed on your system. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-04-07 16:07:39 UTC (rev 1401) +++ trunk/configure.ac 2008-04-15 22:13:27 UTC (rev 1402) @@ -350,10 +350,10 @@ 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(OGG, test x$has_ogg = xyes && test x$with_ogg != xno) +AM_CONDITIONAL(THEORA, test x$has_theora = xyes && test x$with_theora != xno) +AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes && test x$with_vidcap != xno) +AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes && test x$with_ffmpeg != xno) 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |