Misc small changes.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 9e207fed523d74ebcb5d7c2986238855a38b5469..94b6c22203a529e7f70ec991d21dbc1c19c6a92d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,6 @@ AC_CONFIG_SRCDIR([lily/main.cc])
 # Move to aclocal.m4?
 AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
-AC_C_BIGENDIAN(CFLAGS="$CFLAGS -DBIGENDIAN",
-               CFLAGS="$CFLAGS -DSMALLENDIAN")
-              
-              
-
-
 # Uncomment the configuration options your package needs.
 
 
@@ -36,6 +30,8 @@ AC_ARG_ENABLE(gui,
 # must come before any header checks
 STEPMAKE_COMPILE
 
+STEPMAKE_KPATHSEA
+
 STEPMAKE_PYTHON(REQUIRED,2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
@@ -55,7 +51,6 @@ STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
-STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
@@ -64,7 +59,7 @@ STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
 
 AC_CHECK_HEADERS([assert.h libio.h sys/stat.h])
 AC_LANG_PUSH(C++)
-1AC_CHECK_HEADERS([sstream])
+AC_CHECK_HEADERS([sstream])
 AC_LANG_POP(C++)
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
@@ -79,6 +74,11 @@ fi
 STEPMAKE_FREETYPE2
 STEPMAKE_PANGO_FT2
 
+## TTFTOOL stuff
+AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",
+               TTFTOOL_ENDIAN="-DSMALLENDIAN")
+AC_SUBST(TTFTOOL_ENDIAN)
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
@@ -93,7 +93,6 @@ STEPMAKE_PERL(OPTIONAL)
 # without the docs, they can find this comment and use an older
 # makeinfo -- but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
-AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then