fi
save_CFLAGS="$CFLAGS"
- CFLAGS="-shared $CFLAGS"
+ CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//')
AC_MSG_CHECKING([for shared libkpathsea])
AC_TRY_LINK([#include <kpathsea/kpathsea.h>],
[kpse_var_expand ("\$TEXMF");],
[have_libkpathsea_so=maybe;
- shared_size=`wc -c conftest | sed 's/ .*//g'`]
+ shared_size=`wc -c conftest`;
+ shared_size=`echo $shared_size | sed -e 's/ .*//g'`],
[have_libkpathsea_so=no])
if test "$have_libkpathsea_so" = "maybe"; then
if test "$kpathsea_b" != no; then
AC_MSG_RESULT(yes)
KPATHSEA=1
- if test "$have_libkpathsea_so" = "no"; then
- KPATHSEA_LIBS="-lkpathsea"
- fi
else
AC_MSG_RESULT(no)
KPATHSEA=0
AC_SUBST(KPATHSEA)
AC_SUBST(KPATHSEA_LIBS)
+ AC_SUBST(HAVE_LIBKPATHSEA_SO, $have_libkpathsea_so)
AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA)
])
AC_DEFUN(STEPMAKE_MAKEINFO, [
STEPMAKE_PROGS(MAKEINFO, makeinfo, $1)
- if test "$MAKEINFO" = "makeinfo"; then
- AC_MSG_CHECKING(whether makeinfo can split html by @node)
- mkdir -p out
- makeinfo --html --output=out/split <<EOF
-\input texinfo
-\input texinfo @c -*-texinfo-*-
-@setfilename split.info
-@settitle split.info
-@bye
-EOF
- if test -d out/split; then
- SPLITTING_MAKEINFO=yes
- AC_MSG_RESULT(yes)
- rm -rf out/split
- else
- AC_MSG_RESULT(no)
- STEPMAKE_WARN(your html documentation will be one large file)
- rm -rf out/split
- fi
- fi
- AC_SUBST(SPLITTING_MAKEINFO)
])
-
AC_DEFUN(STEPMAKE_MAN, [
STEPMAKE_PROGS(GROFF, groff ditroff, $1)
AC_SUBST(GROFF)
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
fi
])
-
AC_DEFUN(STEPMAKE_FREETYPE2, [
- PKG_CHECK_MODULES(FREETYPE2, freetype2 >= 0, have_freetype2=true, true)
- if $have_freetype2 ; then
+ PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true)
+ if test "$have_freetype2" = yes; then
AC_DEFINE(HAVE_FREETYPE2)
AC_SUBST(FREETYPE2_CFLAGS)
AC_SUBST(FREETYPE2_LIBS)
+ else
+ r="lib$1-dev or $1-devel"
+ ver="$(pkg-config --modversion $1)"
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
])
AC_DEFUN(STEPMAKE_GTK2, [
- PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.4.0, have_gtk2=true, true)
- if $have_gtk2 ; then
+ PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true)
+ if test "$have_gtk2" = yes ; then
AC_DEFINE(HAVE_GTK2)
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
+ else
+ r="lib$1-dev or $1-devel"
+ ver="$(pkg-config --modversion $1)"
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
])
AC_DEFUN(STEPMAKE_PANGO, [
- PKG_CHECK_MODULES(PANGO, pango >= 1.6.0, have_pango16=true, true)
- if $have_pango16 ; then
+ PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true)
+ if test "$have_pango16" = yes ; then
AC_DEFINE(HAVE_PANGO16)
PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS"
PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS"
AC_SUBST(PANGO_LIBS)
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
-fi
+ else
+ r="lib$1-dev or $1-devel"
+ ver="$(pkg-config --modversion $1)"
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+ fi
])
-
AC_DEFUN(STEPMAKE_PANGO_FT2, [
- PKG_CHECK_MODULES(PANGO_FT2, pangoft2 >= 1.6.0, have_pangoft2=true, true)
- if $have_pangoft2 ; then
+ PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, have_pangoft2=yes, true)
+ if test "$have_pangoft2" = yes ; then
+ AC_DEFINE(HAVE_PANGO16)
AC_DEFINE(HAVE_PANGO_FT2)
PANGO_FT2_CFLAGS="$PANGO_FT2_CFLAGS $GTK2_CFLAGS"
PANGO_FT2_LIBS="$PANGO_FT2_LIBS $GTK2_LIBS"
AC_SUBST(PANGO_FT2_LIBS)
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
-fi
+ else
+ r="lib$1-dev or $1-devel"
+ ver="$(pkg-config --modversion $1)"
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+ fi
+])
+
+AC_DEFUN(STEPMAKE_FONTCONFIG, [
+ PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true)
+ if test "$have_fontconfig" = yes ; then
+ AC_DEFINE(HAVE_FONTCONFIG)
+ FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
+ FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
+ # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS"
+ LIBS="$FONTCONFIG_LIBS $LIBS"
+ AC_SUBST(FONTCONFIG_CFLAGS)
+ AC_SUBST(FONTCONFIG_LIBS)
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
+ else
+ r="lib$1-dev or $1-devel"
+ ver="$(pkg-config --modversion $1)"
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+ fi
])