[xiph-commits] r15658 - trunk/vorbis

[erikd at svn.xiph.org]

Author: erikd
Date: 2009-02-04 23:06:20 -0800 (Wed, 04 Feb 2009)
New Revision: 15658

Modified:
   trunk/vorbis/configure.ac
Log:
configure.ac : Make sure configure script is valid even if PKG_CHECK_MODULES can't be expanded by aclocal.

Modified: trunk/vorbis/configure.ac
===================================================================
--- trunk/vorbis/configure.ac	2009-02-05 06:43:02 UTC (rev 15657)
+++ trunk/vorbis/configure.ac	2009-02-05 07:06:20 UTC (rev 15658)
@@ -203,8 +203,13 @@
 AC_CHECK_LIB(m, cos, VORBIS_LIBS="-lm", VORBIS_LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
+PKG_PROG_PKG_CONFIG
+
 HAVE_OGG=no
-PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
+if test "x$PKG_CONFIG" != "x"
+then
+  PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
+fi
 if test "x$HAVE_OGG" = "xno"
 then
   dnl fall back to the old school test