build: modernize a bit autoconf setup (to 2.69)

diff --git a/configure.ac b/configure.ac
index 5128569de869c1066e4bb6030867d9f2d2586012..d101deefa19451cbb4c0ed9b01559e0d9f9d3732 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ### Base configuration
 
 # Configure autoconf
-AC_PREREQ([2.64])
+AC_PREREQ([2.69])
 
 AC_INIT([lldpd],
         [m4_esyscmd_s([./get-version])],
@@ -49,7 +49,7 @@ if test x"$ac_cv_prog_cc_c99" = x"no"; then
   AC_MSG_FAILURE([*** C99 support is mandatory])
 fi
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_LN_S
 AC_PROG_EGREP
 AC_PROG_AWK
@@ -188,11 +188,10 @@ if test x"$with_libbsd" != x"no"; then
     CFLAGS="$CFLAGS $libbsd_CFLAGS"
     LIBS="$LIBS $libbsd_LIBS"
     AC_MSG_CHECKING([if libbsd can be linked correctly])
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
   @%:@include <sys/time.h>
   @%:@include <sys/types.h>
-  ],[],
-      [
+  ]], [[]])],[
         AC_MSG_RESULT(yes)
         LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
         LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"

diff --git a/m4/libevent.m4 b/m4/libevent.m4
index bb3d53ed2388139193b3860c2148a739a2fa3d2b..62e49801b69c2430e3a4e9a0ad93005ecf32c38b 100644 (file)
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -20,13 +20,12 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
        _save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $libevent_CFLAGS"
        LIBS="$LIBS $libevent_LIBS"
-       AC_TRY_LINK([
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 @%:@include <sys/time.h>
 @%:@include <sys/types.h>
-@%:@include <event2/event.h>], [ struct event_base *base = event_base_new(); event_new(base, -1, 0, NULL, NULL); ],
-       [
+@%:@include <event2/event.h>]], [[ struct event_base *base = event_base_new(); event_new(base, -1, 0, NULL, NULL); ]])],[
          AC_MSG_RESULT([yes])
-       ], [
+       ],[
          if test x"$with_embedded_libevent" = x"auto"; then
            AC_MSG_RESULT([no, using shipped libevent])
            LIBEVENT_EMBEDDED=1

diff --git a/m4/progname.m4 b/m4/progname.m4
index 28ac1748f70051390bf6e2e83cf5480794890f71..031aba65cbf0cc7dc86ba6b598e63d61d78bb688 100644 (file)
--- a/m4/progname.m4
+++ b/m4/progname.m4
@@ -3,10 +3,11 @@
 #
 AC_DEFUN([lldp_CHECK___PROGNAME],[
   AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [
-    AC_TRY_LINK([],
-       [ extern char *__progname; printf("%s", __progname); ],
-       [ lldp_cv_check___progname="yes" ],
-       [ lldp_cv_check___progname="no" ])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                     [[]],
+                     [[ extern char *__progname; printf("%s", __progname); ]])],
+                     [ lldp_cv_check___progname="yes" ],
+                     [ lldp_cv_check___progname="no" ])
   ])
   if test x"$lldp_cv_check___progname" = x"yes"; then
      AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])