devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=69cb06943538bb19ce07c8e60568b5cc13aacc87
commit 69cb06943538bb19ce07c8e60568b5cc13aacc87 Author: Christopher Michael <devilho...@comcast.net> Date: Fri Feb 12 12:01:07 2021 -0500 express: Update autogen.sh for meson --- autogen.sh | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3c1192f..9c632a0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,24 +1,5 @@ #!/bin/sh -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - ( - cd "$srcdir" && - ( - rm -rf autom4te.cache - rm -f aclocal.m4 ltmain.sh - touch README - touch ABOUT-NLS - - echo "Running autopoint..." ; autopoint -f || : - echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 - echo "Running autoconf..." ; autoconf || exit 1 - echo "Running autoheader..." ; autoheader || exit 1 - echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 - echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 - ) - ) - -if [ -z "$NOCONFIGURE" ]; then - $srcdir/configure "$@" -fi +rm -rf build +meson $@ . build +meson configure build --