* linux_ppdev.h: Caught two more instances of exit()

* configure.ac: Add AC_CONFIG_MACRO_DIR as suggested by libtoolize
* Makefile.am: add -I m4 to ACLOCAL_AMFLAGS as suggested by libtoolize



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1308 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2014-05-19 08:46:52 +00:00
parent 15a08ee93f
commit 8a6f8b04bd
4 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2014-05-19 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* linux_ppdev.h: Caught two more instances of exit()
* configure.ac: Add AC_CONFIG_MACRO_DIR as suggested by libtoolize
* Makefile.am: add -I m4 to ACLOCAL_AMFLAGS as suggested by libtoolize
2014-05-16 Axel Wachtler <axel@uracoli.de> 2014-05-16 Axel Wachtler <axel@uracoli.de>
* arduino.c: Replacing all occurences of fprintf(stderr,...) with avrdude_message(...) * arduino.c: Replacing all occurences of fprintf(stderr,...) with avrdude_message(...)

View File

@ -209,3 +209,5 @@ backup-avrdude-conf:
cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \ cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \
${DESTDIR}${sysconfdir}/avrdude.conf.bak; \ ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
fi fi
ACLOCAL_AMFLAGS = -I m4

View File

@ -32,6 +32,7 @@ AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_SRCDIR([main.c])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(ac_cfg.h) AC_CONFIG_HEADERS(ac_cfg.h)
AC_CONFIG_MACRO_DIR([m4])
LT_INIT() LT_INIT()

View File

@ -36,14 +36,13 @@
avrdude_message("%s: can't claim device \"%s\": %s\n\n", \ avrdude_message("%s: can't claim device \"%s\": %s\n\n", \
progname, port, strerror(errno)); \ progname, port, strerror(errno)); \
close(fd); \ close(fd); \
exit(1); \ return -1; \
} }
#define ppi_release(fd) \ #define ppi_release(fd) \
if (ioctl(fd, PPRELEASE)) { \ if (ioctl(fd, PPRELEASE)) { \
avrdude_message("%s: can't release device: %s\n\n", \ avrdude_message("%s: can't release device: %s\n\n", \
progname, strerror(errno)); \ progname, strerror(errno)); \
exit(1); \
} }
#define DO_PPI_READ(fd, reg, valp) \ #define DO_PPI_READ(fd, reg, valp) \