diff --git a/m4/moo-gtk.m4 b/m4/moo-gtk.m4 index ae47cb17..d28be16a 100644 --- a/m4/moo-gtk.m4 +++ b/m4/moo-gtk.m4 @@ -1,7 +1,7 @@ ############################################################################## # _MOO_SPLIT_VERSION(NAME,version) # -AC_DEFUN([_MOO_SPLIT_VERSION],[AC_REQUIRE([AC_PROG_SED]) +AC_DEFUN([_MOO_SPLIT_VERSION],[AC_REQUIRE([MOO_AC_PROG_SED]) $1[]_VERSION="$2" $1[]_MAJOR_VERSION=`echo "$2" | $SED 's/\([[^.]][[^.]]*\).*/\1/'` $1[]_MINOR_VERSION=`echo "$2" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` diff --git a/m4/moo-progs.m4 b/m4/moo-progs.m4 index f5d90483..f65f5cbb 100644 --- a/m4/moo-progs.m4 +++ b/m4/moo-progs.m4 @@ -8,3 +8,29 @@ AC_DEFUN([MOO_AC_PROGS],[ AC_ARG_VAR([OPAG], [opag]) AC_CHECK_PROG(OPAG, opag, opag) ]) + +############################################################################## +# MOO_AC_PROG_SED +# +# AC_PROG_SED from autoconf-2.60 +# +# ----------- +# Check for a fully functional sed program that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([MOO_AC_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" | sed 99q >conftest.sed + $as_unset ac_script || ac_script= + _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed], + [_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED], + ["$ac_path_SED" -f conftest.sed])])]) + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])# MOO_AC_PROG_SED diff --git a/m4/python-cross-mingw.m4 b/m4/python-cross-mingw.m4 index 1ff50678..3abb2f97 100644 --- a/m4/python-cross-mingw.m4 +++ b/m4/python-cross-mingw.m4 @@ -1,6 +1,6 @@ dnl AM_PYTHON_DEVEL_CROSS_MINGW([action-if-found[,action-if-not-found[,version]]]) AC_DEFUN([AM_PYTHON_DEVEL_CROSS_MINGW],[ - AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([MOO_AC_PROG_SED]) m4_if([$3],[],[ m4_define([_ac_m4_pyver],[]) ],[ diff --git a/moo.mprj b/moo.mprj index 8cda1777..de6d3224 100644 --- a/moo.mprj +++ b/moo.mprj @@ -38,7 +38,7 @@ - /home/muntyan/projects/moo/moo/mooedit/gtksourceview/upstream/ + /home/muntyan/projects/moo/moo/mooedit/ --g-fatal-warnings --new-app --mode=project medit/medit