Am Mittwoch, den 03.09.2008, 19:43 -0400 schrieb Pavel Roskin:
>
> I don't see any old stuff being removed. I don't see any justification
> for any of the changes. The new code is longer and less readable. I
> don't think AC_TRY_COMPILE is a big problem yet. It's not like it won't
> produce a valid test.
http://www.gnu.org/software/autoconf/manual/autoconf.html#Autoconf-Macro-Index
AC_TRY_COMPILE is listed as `Obsolete Macro'.
I attached now even a diff with autoconf 2.62 which I won't commit, but
maybe you or someone else is interested.
Changelog says AC_GNU_SOURCE has been deprecated, though they're
currently no plans to remove it.
Currently it's not really needed but things get easily forgotten, even I
myself forgot a patch from me ..
We don't need to discuss running `autoupdate' in ./autogen.sh this is
really bad.
The Debian Build System has such a feature too but ftp-masters' reject
packages which uses it by default.
You only need to run autoconf -Wall then you see.
Ok they're not shown by default, but I don't like to have obsolte
deprecated stuff if it can be easily avoided like in this case.
> In any case, please try to avoid extra long lines where it can be easily
> avoided.
I hope the intention is now right, Emacs had a problem with it.
> Okuji wrote that he uses Autoconf 2.59, so it would be nice to check
> that your changes would still work with that version.
Luckly it's still avaible in Debian oldstable (sarge)
newest CentOS 5.2 even still has autoconf 2.59
Changes are the same as with 2.61 so 2.59 seems to be fine.
--
Felix Zielcke
Index: configure.ac
===================================================================
--- configure.ac (Revision 1849)
+++ configure.ac (Arbeitskopie)
@@ -31,8 +31,8 @@ dnl (such as TARGET_CC, TARGET_CFLAGS, e
dnl type.
-AC_INIT(GRUB, 1.96, [EMAIL PROTECTED])
-AC_PREREQ(2.53)
+AC_INIT([GRUB],[1.96],[EMAIL PROTECTED])
+AC_PREREQ(2.62)
AC_CONFIG_SRCDIR([include/grub/dl.h])
AC_CONFIG_HEADER([config.h])
@@ -150,7 +150,7 @@ AC_PROG_CC
# Must be GCC.
test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
# Identify characteristics of the host architecture.
@@ -266,7 +266,7 @@ if test "x$TARGET_CFLAGS" = x; then
# optimization flags.
AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
CFLAGS=-Os
- AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[grub_cv_cc_Os=yes],[grub_cv_cc_Os=no])
])
if test "x$grub_cv_cc_Os" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -Os"
@@ -278,7 +278,7 @@ if test "x$TARGET_CFLAGS" = x; then
if test "x$target_cpu" = xi386; then
AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
CFLAGS="-falign-loops=1"
- AC_TRY_COMPILE(, , [grub_cv_cc_falign_loop=yes], [grub_cv_cc_falign_loop=no])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[grub_cv_cc_falign_loop=yes],[grub_cv_cc_falign_loop=no])
])
if test "x$grub_cv_cc_falign_loop" = xyes; then
Index: config.h.in
===================================================================
--- config.h.in (Revision 1849)
+++ config.h.in (Arbeitskopie)
@@ -109,17 +109,48 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
+#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
Index: aclocal.m4
===================================================================
--- aclocal.m4 (Revision 1849)
+++ aclocal.m4 (Arbeitskopie)
@@ -2,9 +2,9 @@ dnl Check whether target compiler is wor
AC_DEFUN(grub_PROG_TARGET_CC,
[AC_MSG_CHECKING([whether target compiler is working])
AC_CACHE_VAL(grub_cv_prog_target_cc,
-[AC_TRY_LINK([], [],
- grub_cv_prog_target_cc=yes,
- grub_cv_prog_target_cc=no)
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+[grub_cv_prog_target_cc=yes],
+[grub_cv_prog_target_cc=no])
])
AC_MSG_RESULT([$grub_cv_prog_target_cc])
@@ -104,9 +104,9 @@ AC_DEFUN(grub_PROG_LD_BUILD_ID_NONE,
AC_CACHE_VAL(grub_cv_prog_ld_build_id_none,
[save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--build-id=none"
-AC_TRY_LINK([], [],
- grub_cv_prog_ld_build_id_none=yes,
- grub_cv_prog_ld_build_id_none=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+[grub_cv_prog_ld_build_id_none=yes],
+[grub_cv_prog_ld_build_id_none=no])
LDFLAGS="$save_LDFLAGS"
])
AC_MSG_RESULT([$grub_cv_prog_ld_build_id_none])
@@ -230,17 +230,17 @@ AC_DEFUN(grub_CHECK_START_SYMBOL,
[AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING([if start is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_start_symbol,
-[AC_TRY_LINK([], [asm ("incl start")],
- grub_cv_check_start_symbol=yes,
- grub_cv_check_start_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl start")]])],
+[grub_cv_check_start_symbol=yes],
+[grub_cv_check_start_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_start_symbol])
AC_MSG_CHECKING([if _start is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_uscore_start_symbol,
-[AC_TRY_LINK([], [asm ("incl _start")],
- grub_cv_check_uscore_start_symbol=yes,
- grub_cv_check_uscore_start_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl _start")]])],
+[grub_cv_check_uscore_start_symbol=yes],
+[grub_cv_check_uscore_start_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_uscore_start_symbol])
@@ -261,25 +261,25 @@ AC_DEFUN(grub_CHECK_BSS_START_SYMBOL,
[AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING([if __bss_start is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_uscore_uscore_bss_start_symbol,
-[AC_TRY_LINK([], [asm ("incl __bss_start")],
- grub_cv_check_uscore_uscore_bss_start_symbol=yes,
- grub_cv_check_uscore_uscore_bss_start_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl __bss_start")]])],
+[grub_cv_check_uscore_uscore_bss_start_symbol=yes],
+[grub_cv_check_uscore_uscore_bss_start_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_uscore_uscore_bss_start_symbol])
AC_MSG_CHECKING([if edata is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_edata_symbol,
-[AC_TRY_LINK([], [asm ("incl edata")],
- grub_cv_check_edata_symbol=yes,
- grub_cv_check_edata_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl edata")]])],
+[grub_cv_check_edata_symbol=yes],
+[grub_cv_check_edata_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_edata_symbol])
AC_MSG_CHECKING([if _edata is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_uscore_edata_symbol,
-[AC_TRY_LINK([], [asm ("incl _edata")],
- grub_cv_check_uscore_edata_symbol=yes,
- grub_cv_check_uscore_edata_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl _edata")]])],
+[grub_cv_check_uscore_edata_symbol=yes],
+[grub_cv_check_uscore_edata_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_uscore_edata_symbol])
@@ -302,17 +302,17 @@ AC_DEFUN(grub_CHECK_END_SYMBOL,
[AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING([if end is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_end_symbol,
-[AC_TRY_LINK([], [asm ("incl end")],
- grub_cv_check_end_symbol=yes,
- grub_cv_check_end_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl end")]])],
+[grub_cv_check_end_symbol=yes],
+[grub_cv_check_end_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_end_symbol])
AC_MSG_CHECKING([if _end is defined by the compiler])
AC_CACHE_VAL(grub_cv_check_uscore_end_symbol,
-[AC_TRY_LINK([], [asm ("incl _end")],
- grub_cv_check_uscore_end_symbol=yes,
- grub_cv_check_uscore_end_symbol=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[asm ("incl _end")]])],
+[grub_cv_check_uscore_end_symbol=yes],
+[grub_cv_check_uscore_end_symbol=no])])
AC_MSG_RESULT([$grub_cv_check_uscore_end_symbol])
Index: configure.ac
===================================================================
--- configure.ac (Revision 1849)
+++ configure.ac (Arbeitskopie)
@@ -31,8 +31,8 @@ dnl (such as TARGET_CC, TARGET_CFLAGS, e
dnl type.
-AC_INIT(GRUB, 1.96, [EMAIL PROTECTED])
-AC_PREREQ(2.53)
+AC_INIT([GRUB],[1.96],[EMAIL PROTECTED])
+AC_PREREQ(2.59)
AC_CONFIG_SRCDIR([include/grub/dl.h])
AC_CONFIG_HEADER([config.h])
@@ -266,7 +266,9 @@ if test "x$TARGET_CFLAGS" = x; then
# optimization flags.
AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
CFLAGS=-Os
- AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_Os=yes],
+ [grub_cv_cc_Os=no])
])
if test "x$grub_cv_cc_Os" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -Os"
@@ -278,7 +280,9 @@ if test "x$TARGET_CFLAGS" = x; then
if test "x$target_cpu" = xi386; then
AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
CFLAGS="-falign-loops=1"
- AC_TRY_COMPILE(, , [grub_cv_cc_falign_loop=yes], [grub_cv_cc_falign_loop=no])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_falign_loop=yes],
+ [grub_cv_cc_falign_loop=no])
])
if test "x$grub_cv_cc_falign_loop" = xyes; then
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
