Rev 298 | Details | Compare with Previous | Last modification | View Log | RSS feed
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 299 | magnus | 1 | Description: Support recent versions of libfreetype that (only) provide pkg-config files |
| 2 | Origin: upstream, http://pike-librarian.lysator.liu.se/index.xml?checkins=46adc327dea6d6d237a39d21bad2125b9b2501b1,4b8cdf2bc0586becc76fe725473395b63aa3caa5 |
||
| 3 | Author: Henrik Grubbström (Grubba) <grubba@grubba.org> |
||
| 4 | |||
| 5 | diff --git a/src/aclocal.m4 b/src/aclocal.m4 |
||
| 6 | index 82d0288a1d..3f7551044b 100644 |
||
| 7 | --- a/src/aclocal.m4 |
||
| 8 | +++ b/src/aclocal.m4 |
||
| 9 | @@ -1887,10 +1887,11 @@ AC_DEFUN(PIKE_LOW_PKG_CONFIG, |
||
| 10 | $2="[$]$2 ${pkg_stuff}" |
||
| 11 | ]) |
||
| 12 | |||
| 13 | -dnl package |
||
| 14 | +dnl package, on_success_opt, on_failure_opt |
||
| 15 | AC_DEFUN(PIKE_PKG_CONFIG, |
||
| 16 | [ |
||
| 17 | AC_REQUIRE([PIKE_PROG_PKG_CONFIG])dnl |
||
| 18 | + pike_cv_pkg_config_$1=no |
||
| 19 | if test "${PKG_CONFIG}" = no; then :; else |
||
| 20 | AC_MSG_CHECKING([if a pkg-config based $1 is installed]) |
||
| 21 | if "${PKG_CONFIG}" "$1"; then |
||
| 22 | @@ -1899,8 +1900,16 @@ AC_DEFUN(PIKE_PKG_CONFIG, |
||
| 23 | PIKE_LOW_PKG_CONFIG([$1], [CFLAGS], [--cflags-only-other]) |
||
| 24 | PIKE_LOW_PKG_CONFIG([$1], [LDFLAGS], [--libs-only-L]) |
||
| 25 | PIKE_LOW_PKG_CONFIG([$1], [LIBS], [--libs-only-l --libs-only-other]) |
||
| 26 | + pike_cv_pkg_config_$1=yes |
||
| 27 | else |
||
| 28 | AC_MSG_RESULT(no) |
||
| 29 | fi |
||
| 30 | fi |
||
| 31 | + ifelse([$2$3], , , [ |
||
| 32 | + if test "x$pike_cv_pkg_config_$1" = "xno"; then |
||
| 33 | + ifelse([$3], , :, [$3]) |
||
| 34 | + else |
||
| 35 | + ifelse([$2], , :, [$2]) |
||
| 36 | + fi |
||
| 37 | + ]) |
||
| 38 | ]) |
||
| 39 | diff --git a/src/modules/_Image_FreeType/configure.in b/src/modules/_Image_FreeType/configure.in |
||
| 40 | index 1ce8abea8c..c3ac7f9a85 100644 |
||
| 298 | magnus | 41 | --- a/src/modules/_Image_FreeType/configure.in |
| 42 | +++ b/src/modules/_Image_FreeType/configure.in |
||
| 299 | magnus | 43 | @@ -10,7 +10,11 @@ if test "x$with_freetype" = "xyes" ; then |
| 298 | magnus | 44 | |
| 45 | PIKE_FEATURE_NODEP(Image.FreeType) |
||
| 46 | |||
| 47 | - MY_AC_PATH_PROGS(FT_CONFIG, ${ac_tool_prefix}freetype-config freetype-config, no) |
||
| 299 | magnus | 48 | + PIKE_PKG_CONFIG(freetype2, [ |
| 49 | + FT_CONFIG="${PKG_CONFIG} freetype2" |
||
| 50 | + ], [ |
||
| 51 | + MY_AC_PATH_PROGS(FT_CONFIG, ${pike_cv_tool_prefix}freetype-config ${ac_tool_prefix}freetype-config, no) |
||
| 52 | + ]) |
||
| 298 | magnus | 53 | |
| 54 | if test "$FT_CONFIG" = "no" ; then |
||
| 55 | : |