avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
joerg_wunsch 2008-07-25 21:06:55 +00:00
parent 7f910d3be0
commit 361943769e
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-07-25 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
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 <j.gnu@uriah.heep.sax.de> 2008-06-13 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Contributed by Janos Sallai <janos.sallai@vanderbilt.edu>: Contributed by Janos Sallai <janos.sallai@vanderbilt.edu>:

1
Makefile.am
View File

@ -40,6 +40,7 @@ CLEANFILES = \
#DIST_SUBDIRS = doc windows #DIST_SUBDIRS = doc windows
SUBDIRS = @SUBDIRS_AC@ SUBDIRS = @SUBDIRS_AC@
SUBDIRS += @WINDOWS_DIRS@
DIST_SUBDIRS = @DIST_SUBDIRS_AC@ DIST_SUBDIRS = @DIST_SUBDIRS_AC@
AM_YFLAGS = -d AM_YFLAGS = -d

3
NEWS
View File

@ -22,6 +22,9 @@ Current:
* Add support for the Crossbow MIB510 programmer (patch #6074). * 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: Version 5.5:
* Add support for the USBtinyISP programmer (patch #6233) * Add support for the USBtinyISP programmer (patch #6233)

14
bootstrap
View File

@ -1,11 +1,11 @@
#! /bin/sh #! /bin/sh
# autoconf-2.59 is required # autoconf-2.59 or 2.61 is known to work
: ${AUTOHEADER="autoheader${AC_VER}"} : ${AUTOHEADER="autoheader${AC_VER}"}
: ${AUTOCONF="autoconf${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}"} : ${ACLOCAL="aclocal${AM_VER}"}
: ${AUTOMAKE="automake${AM_VER}"} : ${AUTOMAKE="automake${AM_VER}"}
@ -14,22 +14,20 @@
AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \ AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \
cut -d ' ' -f 4) 2>/dev/null` cut -d ' ' -f 4) 2>/dev/null`
if [ "$AUTOCONF_VER" != "2.59" ] if [ "$AUTOCONF_VER" != "2.59" -a "$AUTOCONF_VER" != "2.61" ]
then 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`." echo "You are using `${AUTOCONF} --version | head -n 1`."
exit 1
fi fi
# Verify automake version # Verify automake version
AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \ AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \
cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null` 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 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`." echo "You are using `${AUTOMAKE} --version | head -n 1`."
exit 1
fi fi
export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE

6
configure.ac
View File

@ -35,7 +35,7 @@ AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(ac_cfg.h) AM_CONFIG_HEADER(ac_cfg.h)
# Checks for programs. # Checks for programs.
AC_PROG_CC AM_PROG_CC_C_O
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_YACC AC_PROG_YACC
AM_PROG_LEX AM_PROG_LEX
@ -166,9 +166,9 @@ AC_ARG_ENABLE(
DIST_SUBDIRS_AC='doc windows' DIST_SUBDIRS_AC='doc windows'
if test "$enabled_doc" = "yes"; then if test "$enabled_doc" = "yes"; then
SUBDIRS_AC='doc @WINDOWS_DIRS@' SUBDIRS_AC='doc'
else else
SUBDIRS_AC='@WINDOWS_DIRS@' SUBDIRS_AC=''
fi fi
AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR) AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)