X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=8df5168b8c9d11947ebefbbf0ea659d0bf59a5f7;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=397b9d8be800385291fe54abfd5d2bb09b9c6c38;hpb=75e2b24fabd5962901580b0d3627cee6b0aa41c1;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 397b9d8be8..8df5168b8c 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -195,7 +195,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ fi if test $profile_b = yes; then - EXTRA_LIBES="-pg" + EXTRA_LIBS="-pg" OPTIMIZE="$OPTIMIZE -pg" fi @@ -243,10 +243,8 @@ AC_DEFUN(STEPMAKE_COMPILE, [ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) - AC_SUBST(ICFLAGS) - AC_SUBST(ILDFLAGS) AC_SUBST(DEFINES) - AC_SUBST(EXTRA_LIBES) + AC_SUBST(EXTRA_LIBS) ]) AC_DEFUN(STEPMAKE_CXX, [ @@ -254,13 +252,11 @@ AC_DEFUN(STEPMAKE_CXX, [ AC_PROG_CXX STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1) - CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS="$LDFLAGS $EXTRA_LIBES" + LD='$(CXX)' - AC_SUBST(CXXFLAGS) AC_SUBST(CXX) - LD='$(CXX)' + AC_SUBST(CXXFLAGS) AC_SUBST(LD) ]) @@ -358,10 +354,26 @@ AC_DEFUN(STEPMAKE_END, [ rm -f $srcdir/GNUmakefile cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile chmod 444 $srcdir/GNUmakefile - else # --srcdir build - rm -f GNUmakefile - cp $srcdir/make/srcdir.make.in GNUmakefile - chmod 444 GNUmakefile + else + if test -f $srcdir/GNUmakefile; then + cat <= $3, have_freetype2=yes, true) if test "$have_freetype2" = yes; then AC_DEFINE(HAVE_FREETYPE2) + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS" + LIBS="$FREETYPE2_LIBS $LIBS" AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" else # UGR #r="lib$1-dev or $1-devel" @@ -1102,8 +1121,15 @@ AC_DEFUN(STEPMAKE_GTK2, [ PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true) if test "$have_gtk2" = yes ; then AC_DEFINE(HAVE_GTK2) + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$GTK2_CFLAGS $CPPFLAGS" + LIBS="$GTK2_LIBS $LIBS" AC_SUBST(GTK2_CFLAGS) AC_SUBST(GTK2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" else # UGR # r="lib$1-dev or $1-devel" @@ -1117,11 +1143,11 @@ AC_DEFUN(STEPMAKE_PANGO, [ 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" # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" + CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS" + LIBS="$PANGO_LIBS $LIBS" AC_CHECK_HEADERS([pango/pangofc-fontmap.h]) AC_CHECK_FUNCS([pango_fc_font_map_add_decoder_find_func]) AC_SUBST(PANGO_CFLAGS) @@ -1142,8 +1168,6 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ 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" # Do not pollute user-CPPFLAGS with configure-CPPFLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" @@ -1168,12 +1192,10 @@ 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" + CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" LIBS="$FONTCONFIG_LIBS $LIBS" AC_SUBST(FONTCONFIG_CFLAGS) AC_SUBST(FONTCONFIG_LIBS)