[Gnash-commit] /srv/bzr/gnash/trunk r11908: fixed a typo in configure.ac & cleaned up gnash_pkg_find

[Markus Gothe]

------------------------------------------------------------
revno: 11908
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-05 03:00:37 +0100
message:
  fixed a typo in configure.ac & cleaned up gnash_pkg_find
modified:
  configure.ac
  macros/gnashpkgtool.m4

=== modified file 'configure.ac'
--- a/configure.ac      2010-02-05 01:24:10 +0000
+++ b/configure.ac      2010-02-05 02:00:37 +0000
@@ -1879,7 +1879,7 @@
 AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
 
 if test x$build_gtk = xno -o x$build_kde4 = xno; then
-  if test x$npapi =xyes; then
+  if test x$npapi = xyes; then
     AC_MSG_WARN(["Enabled NPAPI plugin, but it's not supported by the selected 
GUI"])
   fi
 fi

=== modified file 'macros/gnashpkgtool.m4'
--- a/macros/gnashpkgtool.m4    2010-02-05 00:55:06 +0000
+++ b/macros/gnashpkgtool.m4    2010-02-05 02:00:37 +0000
@@ -129,12 +129,11 @@
       dnl It seems we need to explicitly call AC_DEFINE as AC_CHECK_HEADER 
doesn't
       dnl do this automatically. AC_CHECK_HEADERS (not the final S) would do 
it.
       AC_DEFINE([HAVE_]UPHEADER, 1, [Define if you have the $2 header])
+      AC_MSG_RESULT(${ac_cv_path_$1_incl})
       if test x"${ac_cv_path_$1_incl}" != x -a x"${ac_cv_path_$1_incl}" != 
x"-I/usr/include"; then
-        UP[]_CFLAGS="${ac_cv_path_$1_incl}"
-        AC_MSG_RESULT(${ac_cv_path_$1_incl})
+        UP[]_CFLAGS="${ac_cv_path_$1_incl}"        
       else
         UP[]_CFLAGS=""
-        AC_MSG_RESULT([found])
       fi
   else
        AC_MSG_RESULT([not found])