[DVDnav-discuss] r1294 - trunk/libdvdnav/configure2

rathann subversion at mplayerhq.hu
Thu Dec 19 22:43:15 CET 2013


Author: rathann
Date: Thu Dec 19 22:43:15 2013
New Revision: 1294

Log:
Allow specifying custom pkg-config.

Use pkg-config by default, but allow override by setting PKG_CONFIG
environment variable.

Update --help output correspondigly.

Based on an idea by Mike Frysinger <vapier AT gentoo DOT org>.

Modified:
   trunk/libdvdnav/configure2

Modified: trunk/libdvdnav/configure2
==============================================================================
--- trunk/libdvdnav/configure2	Thu Dec  5 00:52:30 2013	(r1293)
+++ trunk/libdvdnav/configure2	Thu Dec 19 22:43:15 2013	(r1294)
@@ -5,6 +5,7 @@ dvdnav_sh_major=`echo $dvdnav_sh_version
 
 cc=gcc
 make=make
+: ${PKG_CONFIG:=pkg-config}
 
 # find source path
 source_path="`dirname \"$0\"`"
@@ -43,13 +44,15 @@ show_help(){
   echo "Developer options:"
   echo "  --disable-strip          disable stripping of executables and shared libraries"
   echo "  --disable-opts           disable compiler optimizations"
+  echo "Environment variables:"
+  echo "  PKG_CONFIG               use specified pkg-config [$PKG_CONFIG]"
   exit 1
 }
 
 SHARED=yes
 STATIC=yes
 DVDREAD_CONFIG=""
-DVDREAD_PKG_CONFIG="pkg-config dvdread"
+DVDREAD_PKG_CONFIG="${PKG_CONFIG} dvdread"
 PREFIX=/usr/local/
 INSTALLSTRIP=-s
 USEDEBUG=-g
@@ -106,7 +109,7 @@ test -z "$incdir" && incdir=$PREFIX/incl
 
 dvdread=no
 if test -z "$DVDREAD_CONFIG" ; then
-  DVDREAD_CONFIG="pkg-config dvdread"
+  DVDREAD_CONFIG=${DVDREAD_PKG_CONFIG}
   $DVDREAD_CONFIG --exists >> /dev/null 2>&1 && dvdread=yes
 fi
 if test "$dvdread" != "yes" ; then


More information about the DVDnav-discuss mailing list