X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=1228f6ca29c6208a89c19bdf8aee3f651a9c3dcb;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=48d0b77b748d6dd9b3462eb79bfbc20293c53792;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git

diff --git a/aclocal.m4 b/aclocal.m4
index 48d0b77b74..1228f6ca29 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
 
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
-        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
+	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
 	    | head -n 1 \
 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
     fi
@@ -280,11 +281,9 @@ AC_DEFUN(STEPMAKE_CXX, [
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
-    LD='$(CXX)'
 
     AC_SUBST(CXX)
     AC_SUBST(CXXFLAGS)
-    AC_SUBST(LD)
 ])
 
 
@@ -659,7 +658,16 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     AC_MSG_CHECKING([for guile-config])
     guile_config="guile-config"
     found="no"
-    for r in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile2-config guile2.0-config guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; do
+    for r in $GUILE_CONFIG \
+      $target_guile_config $host_guile_config $build_guile_config \
+      guile-config \
+      guile2-config   guile-2-config   guile-config-2   \
+      guile2.2-config guile-2.2-config guile-config-2.2 \
+      guile2.0-config guile-2.0-config guile-config-2.0 \
+      guile1-config   guile-1-config   guile-config-1   \
+      guile1.9-config guile-1.9-config guile-config-1.9 \
+      guile1.8-config guile-1.8-config guile-config-1.8; \
+      do
 	exe=`STEPMAKE_GET_EXECUTABLE($r)`
 	if ! $exe --version > /dev/null 2>&1 ; then
 	    continue
@@ -1336,6 +1344,35 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [
     fi
 ])
 
+AC_DEFUN(STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE, [
+        PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3,
+			  have_pangoft2_with_otf_feature=yes, true)
+    if test "$have_pangoft2_with_otf_feature" = yes ; then
+	AC_DEFINE(HAVE_PANGO16)
+	AC_DEFINE(HAVE_PANGO_FT2)
+	AC_DEFINE(HAVE_PANGO_FT2_WITH_OTF_FEATURE)
+	# Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
+	CPPFLAGS="$CPPFLAGS $PANGO_FT2_CFLAGS"
+	LIBS="$PANGO_FT2_LIBS $LIBS"
+	AC_CHECK_HEADERS([pango/pangoft2.h])
+	AC_CHECK_FUNCS([pango_ft2_font_map_create_context])
+	AC_SUBST(PANGO_FT2_CFLAGS)
+	AC_SUBST(PANGO_FT2_LIBS)
+	CPPFLAGS="$save_CPPFLAGS"
+	LIBS="$save_LIBS"
+    else
+	# UGR
+	#r="lib$1-dev or $1-devel"e
+	r="libpango1.0-dev or pango?-devel"
+	ver="`pkg-config --modversion $1`"
+	STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (It is required if you'd like "])
+	STEPMAKE_ADD_ENTRY($2, ["to use OpenType font feature. "])
+	STEPMAKE_ADD_ENTRY($2, ["installed: $ver)"])
+    fi
+])
+
 AC_DEFUN(STEPMAKE_FONTCONFIG, [
     PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true)
     if test "$have_fontconfig" = yes ; then