From 361943769e6588455fe5ab600b9057ca951b071e Mon Sep 17 00:00:00 2001 From: joerg_wunsch Date: Fri, 25 Jul 2008 21:06:55 +0000 Subject: [PATCH] Contributed by Ville Voipio: patch #6501: New autotools support for avrdude * Makefile.am: add @WINDOWS_DIRS@ to SUBDIR * bootstrap: allow for autconf-2.61 and automake-1.10, too * configure.ac: fix @WINDOWS_DIRS@ recursion, replace AC_PROG_CC by AM_PROG_CC_C_O, for esoteric reasons git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@774 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 9 +++++++++ Makefile.am | 1 + NEWS | 3 +++ bootstrap | 14 ++++++-------- configure.ac | 6 +++--- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d177ff10..d0c52434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-07-25 Joerg Wunsch + + Contributed by Ville Voipio: + patch #6501: New autotools support for avrdude + * Makefile.am: add @WINDOWS_DIRS@ to SUBDIR + * bootstrap: allow for autconf-2.61 and automake-1.10, too + * configure.ac: fix @WINDOWS_DIRS@ recursion, replace + AC_PROG_CC by AM_PROG_CC_C_O, for esoteric reasons + 2008-06-13 Joerg Wunsch Contributed by Janos Sallai : diff --git a/Makefile.am b/Makefile.am index 93e1c0e7..cd710052 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ CLEANFILES = \ #DIST_SUBDIRS = doc windows SUBDIRS = @SUBDIRS_AC@ +SUBDIRS += @WINDOWS_DIRS@ DIST_SUBDIRS = @DIST_SUBDIRS_AC@ AM_YFLAGS = -d diff --git a/NEWS b/NEWS index c429bd89..0560a283 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,9 @@ Current: * Add support for the Crossbow MIB510 programmer (patch #6074). + * Add support to bootstrap with GNU autoconf 2.61, and automake 1.10, + respectively. + Version 5.5: * Add support for the USBtinyISP programmer (patch #6233) diff --git a/bootstrap b/bootstrap index 248c0586..6f85e778 100755 --- a/bootstrap +++ b/bootstrap @@ -1,11 +1,11 @@ #! /bin/sh -# autoconf-2.59 is required +# autoconf-2.59 or 2.61 is known to work : ${AUTOHEADER="autoheader${AC_VER}"} : ${AUTOCONF="autoconf${AC_VER}"} -# automake-1.9.x is required +# automake-1.9.x or 1.10 is known to work : ${ACLOCAL="aclocal${AM_VER}"} : ${AUTOMAKE="automake${AM_VER}"} @@ -14,22 +14,20 @@ AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \ cut -d ' ' -f 4) 2>/dev/null` -if [ "$AUTOCONF_VER" != "2.59" ] +if [ "$AUTOCONF_VER" != "2.59" -a "$AUTOCONF_VER" != "2.61" ] then - echo "You need to use autoconf version 2.59." + echo "Warning: This program is tested with autoconf version 2.59 and 2.61." echo "You are using `${AUTOCONF} --version | head -n 1`." - exit 1 fi # Verify automake version AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \ cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null` -if [ "$AUTOMAKE_VER" != "1.9" ] +if [ "$AUTOMAKE_VER" != "1.9" -a "$AUTOMAKE_VER" != "1.10" ] then - echo "You need to use automake version 1.9." + echo "Warning: This program is tested with automake version 1.9 and 1.10." echo "You are using `${AUTOMAKE} --version | head -n 1`." - exit 1 fi export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE diff --git a/configure.ac b/configure.ac index 352dc526..a67f1c7d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AM_INIT_AUTOMAKE AM_CONFIG_HEADER(ac_cfg.h) # Checks for programs. -AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_YACC AM_PROG_LEX @@ -166,9 +166,9 @@ AC_ARG_ENABLE( DIST_SUBDIRS_AC='doc windows' if test "$enabled_doc" = "yes"; then - SUBDIRS_AC='doc @WINDOWS_DIRS@' + SUBDIRS_AC='doc' else - SUBDIRS_AC='@WINDOWS_DIRS@' + SUBDIRS_AC='' fi AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)