[Gnash-commit] gnash/macros kde.m4 pango.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/03/31 19:55:37

Modified files:
        macros         : kde.m4 pango.m4 

Log message:
        Look for pango.h, not pangogl.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.5 gnash/macros/kde.m4:1.6
--- gnash/macros/kde.m4:1.5     Thu Mar  9 19:29:06 2006
+++ gnash/macros/kde.m4 Fri Mar 31 19:55:37 2006
@@ -4794,9 +4794,9 @@
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function 
anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+dnl    AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
 
-    KDE_SET_DEFAULT_BINDIRS
+dnl    KDE_SET_DEFAULT_BINDIRS
     if test "x$prefix" = "xNONE"; then
     dnl no prefix given: look for kde-config in the PATH and deduce the prefix 
from it
       KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], 
[KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
@@ -4808,31 +4808,31 @@
       PATH="$kde_save_PATH"
     fi
 
-    kde_libs_prefix=`$KDECONFIG --prefix`
-    if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-      AC_MSG_NOTICE([$KDECONFIG --prefix outputed the non existant prefix 
'$kde_libs_prefix' for kdelibs.])
-    fi
-    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-    kde_libs_suffix=`$KDECONFIG --libsuffix`
-
-    AC_MSG_CHECKING([where to install])
-    if test "x$prefix" = "xNONE"; then
-      prefix=$kde_libs_prefix
-      AC_MSG_RESULT([$prefix (as returned by kde-config)])
-    else
-    dnl --prefix was given. Compare prefixes and warn (in 
configure.in.bot.end) if different
-      given_prefix=$prefix
-      AC_MSG_RESULT([$prefix (as requested)])
-    fi
+dnl    kde_libs_prefix=`$KDECONFIG --prefix`
+dnl     if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+dnl       AC_MSG_NOTICE([$KDECONFIG --prefix outputed the non existant prefix 
'$kde_libs_prefix' for kdelibs.])
+dnl     fi
+dnl    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+dnl     kde_libs_suffix=`$KDECONFIG --libsuffix`
+
+dnl     AC_MSG_CHECKING([where to install])
+dnl     if test "x$prefix" = "xNONE"; then
+dnl dnl      prefix=$kde_libs_prefix
+dnl       AC_MSG_RESULT([$prefix (as returned by kde-config)])
+dnl     else
+dnl     dnl --prefix was given. Compare prefixes and warn (in 
configure.in.bot.end) if different
+dnl       given_prefix=$prefix
+dnl       AC_MSG_RESULT([$prefix (as requested)])
+dnl     fi
 
     # And delete superfluous '/' to make compares easier
-    prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-    exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-    given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+dnl     prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+dnl     exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+dnl     given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
 
     AC_SUBST(KDECONFIG)
-    AC_SUBST(kde_libs_prefix)
-    AC_SUBST(kde_libs_htmldir)
+dnl     AC_SUBST(kde_libs_prefix)
+dnl     AC_SUBST(kde_libs_htmldir)
 
     KDE_FAST_CONFIGURE
     KDE_CONF_FILES
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.3 gnash/macros/pango.m4:1.4
--- gnash/macros/pango.m4:1.3   Wed Mar 29 05:42:41 2006
+++ gnash/macros/pango.m4       Fri Mar 31 19:55:37 2006
@@ -42,10 +42,10 @@
   AC_ARG_WITH(pango_incl, [  --with-pango-incl        directory where libpango 
header is], with_pango_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_pango_incl,[
     if test x"${with_pango_incl}" != x ; then
-      if test -f ${with_pango_incl}/pango/pangogl.h ; then
+      if test -f ${with_pango_incl}/pango/pango.h ; then
        ac_cv_path_pango_incl=`(cd ${with_pango_incl}; pwd)`
       else
-       AC_MSG_ERROR([${with_pango_incl} directory doesn't contain 
pango/pangogl.h])
+       AC_MSG_ERROR([${with_pango_incl} directory doesn't contain 
pango/pango.h])
       fi
     fi
   ])
@@ -79,7 +79,7 @@
 
       dnl If the path hasn't been specified, go look for it.
       if test x"${ac_cv_path_pango_incl}" = x; then
-        AC_CHECK_HEADERS(pango/pangogl.h, [ac_cv_path_pango_incl=""],[
+        AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
           if test x"${ac_cv_path_pango_incl}" = x; then
             AC_MSG_CHECKING([for libpango header])
             incllist="/sw/include /usr/local/include /home/latest/include 
/opt/include /usr/include /usr/pkg/include .. ../.."