]> git.donarmstrong.com Git - lilypond.git/blobdiff - configure.in
(glyph-string): remove / before CIDs.
[lilypond.git] / configure.in
index bfa2d26df39e96f226d436fd55a261451853dc99..8507283289c64a4bbc637c7421cf9ddba2802577 100644 (file)
@@ -44,6 +44,7 @@ STEPMAKE_DLOPEN
 STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
+STEPMAKE_FLEXLEXER_LOCATION
 AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
@@ -68,7 +69,7 @@ AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
 AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
-AC_SEARCH_LIBS(wcrtomb, [mingwex msvcp60])
+AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 if test "$gui_b" = "yes"; then
@@ -85,10 +86,13 @@ AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",
                TTFTOOL_ENDIAN="-DSMALLENDIAN")
 AC_SUBST(TTFTOOL_ENDIAN)
 
+STEPMAKE_WINDOWS
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
 STEPMAKE_GUILE(OPTIONAL)
+
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 
@@ -98,7 +102,6 @@ STEPMAKE_PERL(OPTIONAL)
 # makeinfo -- but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 
-
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
     AC_DEFINE(STRINGS_UTILS_INLINED)
@@ -109,7 +112,6 @@ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 # Gather requirements and generate output.
 STEPMAKE_END
 
-
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
 
 cat <<EOF