[Iaxclient-cvs] SF.net SVN: iaxclient: [1113] trunk

[<jpg...@us...>]

Revision: 1113
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1113&view=rev
Author:   jpgrayson
Date:     2007-09-03 12:14:08 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
Apply pkg-config patch.
Thanks to Mikael Magnusson!

Modified Paths:
--------------
    trunk/configure.ac
    trunk/iaxclient.pc.in

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-09-03 19:05:46 UTC (rev 1112)
+++ trunk/configure.ac	2007-09-03 19:14:08 UTC (rev 1113)
@@ -199,6 +199,7 @@
 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!
@@ -220,6 +221,7 @@
 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!
@@ -412,6 +414,7 @@
 done
 
 AC_SUBST(CLIENTS)
+AC_SUBST(PKG_REQUIRES)
 
 AC_CONFIG_FILES([
       Makefile

Modified: trunk/iaxclient.pc.in
===================================================================
--- trunk/iaxclient.pc.in	2007-09-03 19:05:46 UTC (rev 1112)
+++ trunk/iaxclient.pc.in	2007-09-03 19:14:08 UTC (rev 1113)
@@ -7,6 +7,7 @@
 Description: Inter-Asterisk eXchange Client Library
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -liaxclient @PTHREAD_LIBS@
+Libs.private: @GSM_LIBS@
 Cflags: -I${includedir}
-Requires: portaudio-2.0 speex theora ogg
+Requires.private: portaudio-2.0 speex @PKG_REQUIRES@
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.