浏览代码

Replace obsolete autotools macros

The changes to configure.in are all from running autoupdate.

Closes #10
Richard Laager 10 年之前
父节点
当前提交
5f2dfe7507
共有 2 个文件被更改,包括 7 次插入6 次删除
  1. 6 5
      configure.in
  2. 1 1
      src/Makefile.am

+ 6 - 5
configure.in

@@ -1,15 +1,15 @@
-AC_INIT([docsis], [0.9.6])
+AC_INIT([docsis],[0.9.6])
 AC_CONFIG_SRCDIR([src/docsis.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
-AC_LANG_C
-AM_PROG_LIBTOOL
+AC_LANG([C])
+LT_INIT
 dnl AC_PROG_YACC
 AC_PROG_LEX
 
 AC_CHECK_LIB(resolv, inet_aton)
-AC_CHECK_LIBM
+LT_LIB_M
 AC_SUBST(LIBM)
 
 AC_PATH_PROGS([M4], [gm4 gnum4 m4], [notfound],[/usr/local/bin:/usr/freeware/bin:/usr/gnu/bin:${prefix}/bin:${exec_prefix}/bin:$PATH] )
@@ -190,4 +190,5 @@ if test "x$GCC" = "xyes"; then
 	CFLAGS="-Wall $DEBUG_CFLAGS -g $CFLAGS"
 fi
 
-AC_OUTPUT(build_setup.nsi Makefile src/Makefile doc/Makefile examples/Makefile mibs/Makefile)
+AC_CONFIG_FILES([build_setup.nsi Makefile src/Makefile doc/Makefile examples/Makefile mibs/Makefile])
+AC_OUTPUT

+ 1 - 1
src/Makefile.am

@@ -2,7 +2,7 @@ bin_PROGRAMS = docsis
 docsis_SOURCES = docsis.c ethermac.c md5.c docsis_encode.c docsis_decode.c docsis_snmp.c docsis_yy.y docsis_lex.l hmac_md5.c
 
 # set the include path found by configure
-INCLUDES = $(all_includes) $(NETSNMP_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(NETSNMP_CFLAGS)
 
 # the library search path.
 docsis_LDFLAGS = $(all_libraries) $(NETSNMP_LIBS) $(LEXLIB) $(LIBM)