I forgot to remove configure.in and add configure.ac.
This commit is contained in:
parent
7899a91337
commit
49597fd5cb
1 changed files with 16 additions and 13 deletions
|
@ -12,10 +12,11 @@ dnl "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY
|
||||||
dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
|
dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
|
||||||
dnl USE OF THIS SOFTWARE.
|
dnl USE OF THIS SOFTWARE.
|
||||||
|
|
||||||
AC_INIT(stage2/stage2.c)
|
AC_PREREQ(2.57)
|
||||||
AM_INIT_AUTOMAKE(grub, 0.93)
|
AC_INIT([GRUB], [0.94], [bug-grub@gnu.org])
|
||||||
AM_CONFIG_HEADER(config.h)
|
AC_CONFIG_SRCDIR([stage2/stage2.c])
|
||||||
AC_PREREQ(2.13)
|
AC_CONFIG_HEADER([config.h])
|
||||||
|
AM_INIT_AUTOMAKE
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
@ -59,8 +60,8 @@ AC_PROG_CC
|
||||||
_AM_DEPENDENCIES(CC)
|
_AM_DEPENDENCIES(CC)
|
||||||
|
|
||||||
dnl Because recent automake complains about AS, set it here.
|
dnl Because recent automake complains about AS, set it here.
|
||||||
AS="$CC"
|
CCAS="$CC"
|
||||||
AC_SUBST(AS)
|
AC_SUBST(CCAS)
|
||||||
|
|
||||||
AC_ARG_WITH(binutils,
|
AC_ARG_WITH(binutils,
|
||||||
[ --with-binutils=DIR search the directory DIR to find binutils])
|
[ --with-binutils=DIR search the directory DIR to find binutils])
|
||||||
|
@ -625,13 +626,15 @@ AC_SUBST(NET_CFLAGS)
|
||||||
AC_SUBST(NET_EXTRAFLAGS)
|
AC_SUBST(NET_EXTRAFLAGS)
|
||||||
AC_SUBST(NETBOOT_DRIVERS)
|
AC_SUBST(NETBOOT_DRIVERS)
|
||||||
|
|
||||||
dnl Because recent automake complains about ASFLAGS, set it here.
|
dnl Because recent automake complains about CCASFLAGS, set it here.
|
||||||
ASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
|
CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
|
||||||
AC_SUBST(ASFLAGS)
|
AC_SUBST(CCASFLAGS)
|
||||||
|
|
||||||
|
|
||||||
dnl Output.
|
dnl Output.
|
||||||
AC_OUTPUT([Makefile stage1/Makefile stage2/Makefile docs/Makefile \
|
AC_CONFIG_FILES([Makefile stage1/Makefile stage2/Makefile \
|
||||||
lib/Makefile util/Makefile grub/Makefile \
|
docs/Makefile lib/Makefile util/Makefile \
|
||||||
netboot/Makefile util/grub-image util/grub-install \
|
grub/Makefile netboot/Makefile util/grub-image \
|
||||||
util/grub-md5-crypt util/grub-terminfo])
|
util/grub-install util/grub-md5-crypt \
|
||||||
|
util/grub-terminfo])
|
||||||
|
AC_OUTPUT
|
Loading…
Add table
Add a link
Reference in a new issue