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

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

Revision: 1427
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1427&view=rev
Author:   jpgrayson
Date:     2008-04-24 11:58:00 -0700 (Thu, 24 Apr 2008)

Log Message:
-----------
Rename PKG_REQUIRES to PACKAGE_REQUIRES.
This fixes a build problem that shows up on SuSE Linux Enterprise Desktop 10 SP1 because variable names beginning "PKG_" are forbidden.
Thanks to Matt Crane for the fix!

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

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-04-24 18:49:01 UTC (rev 1426)
+++ trunk/configure.ac	2008-04-24 18:58:00 UTC (rev 1427)
@@ -205,12 +205,14 @@
    AM_PATH_GSM(has_gsm=yes, has_gsm=no)
 fi
 
+PACKAGE_REQUIRES=""
+
 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"
+         PACKAGE_REQUIRES="$PACKAGE_REQUIRES ogg"
       elif test x$with_ogg != xauto ; then
          AC_MSG_ERROR([
             libogg is required to build this package!
@@ -223,7 +225,7 @@
    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"
+         PACKAGE_REQUIRES="$PACKAGE_REQUIRES theora"
       elif test x$with_theora != xauto ; then
          AC_MSG_ERROR([
             libtheora is required to build this package!
@@ -235,7 +237,7 @@
    
    if test x$has_vidcap = xyes; then
       AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
-      PKG_REQUIRES="$PKG_REQUIRES vidcap"
+      PACKAGE_REQUIRES="$PACKAGE_REQUIRES vidcap"
    else
       AC_MSG_ERROR([
          libvidcap is required to build this package!
@@ -247,7 +249,7 @@
    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"
+         PACKAGE_REQUIRES="$PACKAGE_REQUIRES ffmpeg"
       elif test x$with_ffmpeg != xauto ; then
          AC_MSG_ERROR([
             FFmpeg is required to build this package!
@@ -461,7 +463,7 @@
 done
 
 AC_SUBST(CLIENTS)
-AC_SUBST(PKG_REQUIRES)
+AC_SUBST(PACKAGE_REQUIRES)
 
 AC_CONFIG_FILES([
       Makefile

Modified: trunk/iaxclient.pc.in
===================================================================
--- trunk/iaxclient.pc.in	2008-04-24 18:49:01 UTC (rev 1426)
+++ trunk/iaxclient.pc.in	2008-04-24 18:58:00 UTC (rev 1427)
@@ -9,5 +9,5 @@
 Libs: -L${libdir} -liaxclient @PTHREAD_LIBS@
 Libs.private: @GSM_LIBS@
 Cflags: -I${includedir}
-Requires.private: portaudio-2.0 speex @PKG_REQUIRES@
+Requires.private: portaudio-2.0 speex @PACKAGE_REQUIRES@
 


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