php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #62424
Patch fribidi-config revision 2013-04-01 15:04 UTC by clicky at erebot dot net

Patch fribidi-config for fribidi Bug #62424

Patch version 2013-04-01 15:04 UTC

Return to Bug #62424 | Download this patch
Patch Revisions:

Developer: clicky@erebot.net

--- config.m4.bak	2013-04-01 16:38:16.000000000 +0200
+++ config.m4	2013-04-01 16:38:33.000000000 +0200
@@ -8,19 +8,19 @@
 if test "$PHP_FRIBIDI" != "no"; then
 
   if test "$PHP_FRIBIDI" = "yes"; then
-    AC_PATH_PROG(FRIBIDI_CONFIG,fribidi-config,,[/usr/local/bin:$PATH])
+    AC_PATH_PROG(FRIBIDI_CONFIG,pkg-config,,[/usr/local/bin:$PATH])
   else
-    FRIBIDI_CONFIG="$PHP_FRIBIDI/bin/fribidi-config"
+    FRIBIDI_CONFIG="$PHP_FRIBIDI/bin/pkg-config"
   fi
 
   dnl check for fribidi version
   AC_MSG_CHECKING([for FriBidi version])
 
   if test ! -x "$FRIBIDI_CONFIG"; then
-    AC_MSG_ERROR([fribidi-config not found.])
+    AC_MSG_ERROR([pkg-config not found.])
   fi
 
-  fribidi_version_full=`$FRIBIDI_CONFIG --version`
+  fribidi_version_full=`$FRIBIDI_CONFIG --modversion fribidi`
   fribidi_version=`echo ${fribidi_version_full} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 
   if test "$fribidi_version" -ge 10004; then
@@ -30,8 +30,8 @@
   fi
 
   dnl Get the paths
-  FRIBIDI_LIBS=`$FRIBIDI_CONFIG --libs`
-  FRIBIDI_INCS=`$FRIBIDI_CONFIG --cflags`
+  FRIBIDI_LIBS=`$FRIBIDI_CONFIG --libs fribidi`
+  FRIBIDI_INCS=`$FRIBIDI_CONFIG --cflags fribidi`
   
   if  test -n "$FRIBIDI_INCS" && test -n "$FRIBIDI_LIBS"; then
     PHP_EVAL_INCLINE($FRIBIDI_INCS)
 
PHP Copyright © 2001-2022 The PHP Group
All rights reserved.
Last updated: Sat May 21 13:05:45 2022 UTC