Re: [Gnash-dev] pango.m4 patch

[strk]

I applied this myself at the end, at least I can build
the code.
Note that for the PKG_CONFIG case we can easily extract
version with --modversion (haven't changed your patch for this thouhgh)

--strk;

On Fri, Aug 11, 2006 at 12:02:24PM +0200, Patrice Dumas wrote:
> Hello,
> 
> On a fedora development, one have
> $ pkg-config --libs pango
> -L/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 
> 
> so the snippet in pango.m4 that use
> 
> ac_cv_path_pango_lib=`$PKG_CONFIG --libs pango`
> gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' | sed -  
> -e 's/-lpango-//'`
> 
> Fails, since the version is then -L/lib...
> 
> In the attached patch the above snippet is used only if the version 
> isn't found using the include dir name.
> 
> --
> Pat

> ? macros/libtool.m4-new
> Index: macros/pango.m4
> ===================================================================
> RCS file: /sources/gnash/gnash/macros/pango.m4,v
> retrieving revision 1.13
> diff -u -3 -p -r1.13 pango.m4
> --- macros/pango.m4   10 Aug 2006 16:46:56 -0000      1.13
> +++ macros/pango.m4   10 Aug 2006 23:11:20 -0000
> @@ -56,7 +56,6 @@ AC_DEFUN([GNASH_PATH_PANGO],
>    dnl Attempt to find the top level directory, which unfortunately has a
>    dnl version number attached. At least on Debain based systems, this
>    dnl doesn't seem to get a directory that is unversioned.
> -  if test x"${ac_cv_path_pango_incl}" = x; then
>      AC_MSG_CHECKING([for the Pango Version])
>        pathlist="/sw/include /usr/local/include /opt/local/include 
> /usr/X11R6/include /home/latest/include /opt/include /usr/include 
> /usr/pkg/include .. ../.."
>  
> @@ -71,7 +70,6 @@ AC_DEFUN([GNASH_PATH_PANGO],
>            fi
>          done
>        done
> -  fi                 dnl if pango_incl
>  
>    if test x"${gnash_pango_topdir}" = x; then
>      AC_MSG_RESULT(none)
> @@ -127,7 +125,9 @@ AC_DEFUN([GNASH_PATH_PANGO],
>    dnl a hugly complex configure test.
>    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
>      ac_cv_path_pango_lib=`$PKG_CONFIG --libs pango`
> -    gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' | 
> sed -e 's/-lpango-//'`
> +    if test x"$gnash_pango_version" = x; then
> +       gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' | 
> sed -e 's/-lpango-//'`
> +    fi
>      ac_cv_path_pango_lib="${ac_cv_path_pango_lib} 
> -lpangox-${gnash_pango_version}"
>    fi
>  

> _______________________________________________
> Gnash-dev mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-dev


-- 

 /"\    ASCII Ribbon Campaign
 \ /    Respect for low technology.
  X     Keep e-mail messages readable by any computer system.
 / \    Keep it ASCII.