008-09-21 Felix Zielcke <fzielcke@z-51.de>

	* configure.ac (AC_INIT): Quote version number.
	(AC_PREREQ): Bumped to 2.59.
	(AC_TRY_COMPILE): Replace obsolete macro with ...
	(AC_COMPILE_IFELSE): ... this.
	* aclocal.m4 (AC_TRY_LINK): Replace obsolete macro with ...
	(AC_LINK_IFELSE): ... this.

diff --git a/ChangeLog b/ChangeLog
index b98bcc70541faf2fb50e84e162002688fb89b8e4..734616b697455dc790adc6a8116b80b40cc56c9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+008-09-21  Felix Zielcke  <fzielcke@z-51.de>
+
+       * configure.ac (AC_INIT): Quote `GRUB' string and version number.
+       (AC_PREREQ): Bumped to 2.59.
+       (AC_TRY_COMPILE): Replace obsolete macro with ...
+       (AC_COMPILE_IFELSE): ... this.
+       * aclocal.m4 (AC_TRY_LINK): Replace obsolete macro with ...
+       (AC_LINK_IFELSE): ... this.
+
 2008-09-21  Felix Zielcke  <fzielcke@z-51.de>
 
        * autogen.sh: Add a call to `gendistlist.sh'.

diff --git a/aclocal.m4 b/aclocal.m4
index 7be8d3b2fdd0e13f5a4deab79680f00ea7336b72..1dd5ffb3f2c57d2c0cb3ce768089cf599a849f62 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,9 +2,9 @@ dnl Check whether target compiler is working
 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,19 @@ 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 +263,28 @@ 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 +307,19 @@ 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])
 

diff --git a/configure.ac b/configure.ac
index 2b0d1467f2b675992265ff93742847625c1b03e1..dab8002a77a2533cbc3ec71eb3de3ba348aff29e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
 dnl type.
 
 
-AC_INIT(GRUB, 1.96, [bug-grub@gnu.org])
-AC_PREREQ(2.53)
+AC_INIT([GRUB],[1.96],[bug-grub@gnu.org])
+AC_PREREQ(2.61)
 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