Merge from vendor branch TNF:
[pkgsrcv2.git] / cross / avrdude / patches / patch-ae
1 $NetBSD: patch-ae,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
2
3 - add missing AM_PROG_CC_C_O that automake wants for the yacc
4   sources.
5
6 - allow a different default serial/parallel port to be specified
7   which is useful for pkgsrc (since we have defaults for various
8   platforms available and they're not the same for different
9   MACHINE_ARCH's in NetBSD).
10
11 --- configure.ac.orig   2010-01-19 10:39:11.000000000 +0000
12 +++ configure.ac
13 @@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
14  
15  # Checks for typedefs, structures, and compiler characteristics.
16  AC_C_CONST
17 +AM_PROG_CC_C_O
18  AC_HEADER_TIME
19  
20  # Checks for library functions.
21 @@ -187,34 +188,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
22  
23  # Find the parallel serial device files based on target system
24  # If a system doesn't have a PC style parallel, mark it as unknown.
25 +#
26 +# Allow the user to set the value of both
27  case $target in
28         i[[3456]]86-*-linux*|x86_64-*-linux*)
29 -               DEFAULT_PAR_PORT="/dev/parport0"
30 -               DEFAULT_SER_PORT="/dev/ttyS0"
31 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/parport0"}
32 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"}
33                 ;;
34         *-*-linux*)
35 -               DEFAULT_PAR_PORT="unknown"
36 -               DEFAULT_SER_PORT="/dev/ttyS0"
37 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
38 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"}
39                 ;;
40         i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
41 -               DEFAULT_PAR_PORT="/dev/ppi0"
42 -               DEFAULT_SER_PORT="/dev/cuad0"
43 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
44 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
45                 ;;
46         *-*-*freebsd*)
47 -               DEFAULT_PAR_PORT="unknown"
48 -               DEFAULT_SER_PORT="/dev/cuad0"
49 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
50 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
51 +               ;;
52 +       *-*-dragonfly*)
53 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
54 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
55 +               ;;
56 +       *-*-netbsd*)
57 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
58 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/tty00"}
59                 ;;
60         *-*-solaris*)
61 -               DEFAULT_PAR_PORT="/dev/printers/0"
62 -               DEFAULT_SER_PORT="/dev/term/a"
63 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/printers/0"}
64 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/term/a"}
65                 ;;
66         *-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
67 -               DEFAULT_PAR_PORT="lpt1"
68 -               DEFAULT_SER_PORT="com1"
69 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"lpt1"}
70 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"com1"}
71                 ;;
72         *)
73 -               DEFAULT_PAR_PORT="unknown"
74 -               DEFAULT_SER_PORT="unknown"
75 +               DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
76 +               DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"unknown"}
77                 ;;
78  esac
79