mirror of
https://github.com/matrix-construct/construct
synced 2024-10-31 19:08:59 +01:00
Move m4 to tools/m4.
This commit is contained in:
parent
38b3bf3abe
commit
a9082eb03a
11 changed files with 11 additions and 11 deletions
16
.gitignore
vendored
16
.gitignore
vendored
|
@ -34,14 +34,14 @@ tools/mkpasswd
|
||||||
tools/viconf
|
tools/viconf
|
||||||
/libtool
|
/libtool
|
||||||
Makefile.in
|
Makefile.in
|
||||||
m4/argz.m4
|
tools/m4/argz.m4
|
||||||
m4/libtool.m4
|
tools/m4/libtool.m4
|
||||||
m4/ltargz.m4
|
tools/m4/ltargz.m4
|
||||||
m4/ltdl.m4
|
tools/m4/ltdl.m4
|
||||||
m4/ltoptions.m4
|
tools/m4/ltoptions.m4
|
||||||
m4/ltsugar.m4
|
tools/m4/ltsugar.m4
|
||||||
m4/ltversion.m4
|
tools/m4/ltversion.m4
|
||||||
m4/lt~obsolete.m4
|
tools/m4/lt~obsolete.m4
|
||||||
*.dSYM/
|
*.dSYM/
|
||||||
install-sh
|
install-sh
|
||||||
ylwrap
|
ylwrap
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I tools/m4
|
||||||
|
|
||||||
SUBDIRS = include/ircd
|
SUBDIRS = include/ircd
|
||||||
SUBDIRS += ircd
|
SUBDIRS += ircd
|
||||||
|
|
|
@ -79,7 +79,7 @@ run_or_die ()
|
||||||
parse_options "$@"
|
parse_options "$@"
|
||||||
|
|
||||||
echo "*** Generating Charybdis build..."
|
echo "*** Generating Charybdis build..."
|
||||||
run_or_die $ACLOCAL -I m4
|
run_or_die $ACLOCAL -I tools/m4
|
||||||
run_or_die $LIBTOOLIZE --force --copy
|
run_or_die $LIBTOOLIZE --force --copy
|
||||||
run_or_die $AUTOHEADER
|
run_or_die $AUTOHEADER
|
||||||
run_or_die $AUTOCONF
|
run_or_die $AUTOCONF
|
||||||
|
|
|
@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = 1.11
|
||||||
AC_INIT([construct], [1.0-dev])
|
AC_INIT([construct], [1.0-dev])
|
||||||
AC_GNU_SOURCE
|
AC_GNU_SOURCE
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
AC_PREFIX_DEFAULT([/])
|
AC_PREFIX_DEFAULT([/])
|
||||||
|
AC_CONFIG_MACRO_DIR([tools/m4])
|
||||||
|
|
||||||
AC_PATH_PROG(AUTOMAKE, automake)
|
AC_PATH_PROG(AUTOMAKE, automake)
|
||||||
AC_PATH_PROG(ACLOCAL, aclocal)
|
AC_PATH_PROG(ACLOCAL, aclocal)
|
||||||
|
|
Loading…
Reference in a new issue