[Gnash-commit] /srv/bzr/gnash/trunk r9939: Make less pkg_config --exist calls, aimed at readability

[Sandro Santilli]

------------------------------------------------------------
revno: 9939
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-10-06 18:48:39 +0200
message:
  Make less pkg_config --exist calls, aimed at readability
modified:
  macros/xpcom.m4

=== modified file 'macros/xpcom.m4'
--- a/macros/xpcom.m4   2008-10-02 01:34:00 +0000
+++ b/macros/xpcom.m4   2008-10-06 16:48:39 +0000
@@ -57,14 +57,15 @@
   if test x$xpcom = xyes; then
     if test x$cross_compiling = xno; then
       if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_xpcom_incl}" = x; then
+        if $PKG_CONFIG --exists libxul; then
+          ac_cv_path_xpcom_lib="`$PKG_CONFIG --libs libxul`"
+          ac_cv_path_xpidl="`$PKG_CONFIG --libs-only-L libxul`"
+          ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I libxul`"
+        fi
         # prefer libxul-unstable for cflags.
         if $PKG_CONFIG --exists libxul-unstable; then
           ac_cv_path_xpcom_incl="`$PKG_CONFIG --cflags-only-I libxul-unstable`"
-        else
-          $PKG_CONFIG --exists libxul && ac_cv_path_xpcom_incl="`$PKG_CONFIG 
--cflags-only-I libxul`"
         fi
-        $PKG_CONFIG --exists libxul && ac_cv_path_xpcom_lib="`$PKG_CONFIG 
--libs libxul`"
-        $PKG_CONFIG --exists libxul && ac_cv_path_xpidl="`$PKG_CONFIG 
--libs-only-L libxul`"
       fi
     fi
   fi