author | Florian Pose <fp@igh-essen.com> |
Mon, 28 Jul 2008 08:30:44 +0000 | |
branch | stable-1.3 |
changeset 1757 | c5757cebfaea |
parent 1755 | 18141b8631be |
child 1758 | 2f7f5fa7b870 |
permissions | -rw-r--r-- |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
#------------------------------------------------------------------------------ |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
# $Id$ |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3 |
#------------------------------------------------------------------------------ |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4 |
|
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
5 |
AC_PREREQ(2.59) |
1755 | 6 |
AC_INIT([ethercat],[1.3.3-pre],[fp@igh-essen.com]) |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
7 |
AC_CONFIG_AUX_DIR([autoconf]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
8 |
AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2]) |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
9 |
AC_PREFIX_DEFAULT([/opt/etherlab]) |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
10 |
AC_CONFIG_HEADERS([config.h]) |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
11 |
AC_CONFIG_SRCDIR([config.h.in]) |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
12 |
|
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
13 |
#------------------------------------------------------------------------------ |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
14 |
# Global |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
15 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
16 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
17 |
branch=stable |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
18 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
19 |
AC_DEFINE_UNQUOTED(BRANCH, ["$branch"], [Subversion branch]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
20 |
AC_SUBST(BRANCH, [$branch]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
21 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
22 |
#------------------------------------------------------------------------------ |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
23 |
# Linux sources |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
24 |
#------------------------------------------------------------------------------ |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
25 |
|
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
26 |
AC_ARG_WITH([linux-dir], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
27 |
AC_HELP_STRING( |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
28 |
[--with-linux-dir=<DIR>], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
29 |
[Linux kernel sources @<:@running kernel@:>@] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
30 |
), |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
31 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
32 |
sourcedir=[$withval] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
33 |
], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
34 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
35 |
version=[`uname -r`] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
36 |
modulesdir=/lib/modules/${version} |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
37 |
if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
38 |
echo |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
39 |
AC_MSG_ERROR([Failed to find Linux sources. Use --with-linux-dir!]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
40 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
41 |
sourcedir=`cd ${modulesdir}/build && pwd -P` |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
42 |
] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
43 |
) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
44 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
45 |
AC_MSG_CHECKING([for Linux kernel sources]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
46 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
47 |
if test \! -r ${sourcedir}/.config; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
48 |
echo |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
49 |
AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
50 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
51 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
52 |
# Try to get kernel release string |
1739
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
53 |
if test -r ${sourcedir}/include/config/kernel.release; then |
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
54 |
kernelrelease=`cat $sourcedir/include/config/kernel.release` |
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
55 |
elif test -r ${sourcedir}/.kernelrelease; then |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
56 |
kernelrelease=`cat $sourcedir/.kernelrelease` |
1739
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
57 |
elif test -r ${sourcedir}/include/linux/utsrelease.h; then |
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
58 |
hdr=${sourcedir}/include/linux/utsrelease.h |
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
59 |
kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"` |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
60 |
elif test -r ${sourcedir}/include/linux/version.h; then |
1739
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
61 |
hdr=${sourcedir}/include/linux/version.h |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
62 |
kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"` |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
63 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
64 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
65 |
if test -z "$kernelrelease"; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
66 |
echo |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
67 |
AC_MSG_ERROR([Failed to extract Linux kernel version!]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
68 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
69 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
70 |
# Extract three numbers from kernel release string |
1739
5fcbd29151d2
MERGE -r688:759 trunk -> branches/stable-1.2 (release 1.2, part one).
Florian Pose <fp@igh-essen.com>
parents:
1732
diff
changeset
|
71 |
linuxversion=`echo $kernelrelease | grep -oE "^[[0-9]]+\.[[0-9]]+\.[[0-9]]+"` |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
72 |
|
1725
a5a8a64d2b52
MERGE trunk -r 552:553 -> branches/stable-1.1 (--with-linux, mydist)
Florian Pose <fp@igh-essen.com>
parents:
1724
diff
changeset
|
73 |
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
74 |
AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
75 |
AC_SUBST(LINUX_KERNEL_VERSION,[$linuxversion]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
76 |
AC_SUBST(LINUX_MOD_PATH,[/lib/modules/$kernelrelease/ethercat]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
77 |
AC_MSG_RESULT([$LINUX_SOURCE_DIR (Kernel $LINUX_KERNEL_RELEASE)]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
78 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
79 |
#------------------------------------------------------------------------------ |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
80 |
# 8139too driver |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
81 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
82 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
83 |
AC_ARG_ENABLE([8139too], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
84 |
AS_HELP_STRING([--enable-8139too], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
85 |
[Enable 8139too driver]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
86 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
87 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
88 |
yes) enable8139too=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
89 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
90 |
no) enable8139too=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
91 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
92 |
*) AC_MSG_ERROR([Invalid value for --enable-8139too]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
93 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
94 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
95 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
96 |
[enable8139too=1] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
97 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
98 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
99 |
AM_CONDITIONAL(ENABLE_8139TOO, test "x$enable8139too" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
100 |
AC_SUBST(ENABLE_8139TOO,[$enable8139too]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
101 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
102 |
AC_ARG_WITH([8139too-kernel], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
103 |
AC_HELP_STRING( |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
104 |
[--with-8139too-kernel=<X.Y.Z>], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
105 |
[8139too kernel (only if differing)] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
106 |
), |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
107 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
108 |
kernel8139too=[$withval] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
109 |
], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
110 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
111 |
kernel8139too=$linuxversion |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
112 |
] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
113 |
) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
114 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
115 |
if test "x${enable8139too}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
116 |
AC_MSG_CHECKING([for kernel for 8139too driver]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
117 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
118 |
kernels=`ls -1 devices/ | grep -oE "^8139too-.*-" | cut -d "-" -f 2 | uniq` |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
119 |
found=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
120 |
for k in $kernels; do |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
121 |
if test "$kernel8139too" = "$k"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
122 |
found=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
123 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
124 |
done |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
125 |
if test $found -ne 1; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
126 |
AC_MSG_ERROR([kernel $kernel8139too not available for 8139too driver!]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
127 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
128 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
129 |
AC_MSG_RESULT([$kernel8139too]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
130 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
131 |
|
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
132 |
AC_SUBST(KERNEL_8139TOO,[$kernel8139too]) |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
133 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
134 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
135 |
# e100 driver |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
136 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
137 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
138 |
AC_ARG_ENABLE([e100], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
139 |
AS_HELP_STRING([--enable-e100], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
140 |
[Enable e100 driver]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
141 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
142 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
143 |
yes) enablee100=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
144 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
145 |
no) enablee100=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
146 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
147 |
*) AC_MSG_ERROR([Invalid value for --enable-e100]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
148 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
149 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
150 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
151 |
[enablee100=0] # disabled by default |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
152 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
153 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
154 |
AM_CONDITIONAL(ENABLE_E100, test "x$enablee100" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
155 |
AC_SUBST(ENABLE_E100,[$enablee100]) |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
156 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
157 |
AC_ARG_WITH([e100-kernel], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
158 |
AC_HELP_STRING( |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
159 |
[--with-e100-kernel=<X.Y.Z>], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
160 |
[e100 kernel (only if differing)] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
161 |
), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
162 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
163 |
kernele100=[$withval] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
164 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
165 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
166 |
kernele100=$linuxversion |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
167 |
] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
168 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
169 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
170 |
if test "x${enablee100}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
171 |
AC_MSG_CHECKING([for kernel for e100 driver]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
172 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
173 |
kernels=`ls -1 devices/ | grep -oE "^e100-.*-" | cut -d "-" -f 2 | uniq` |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
174 |
found=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
175 |
for k in $kernels; do |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
176 |
if test "$kernele100" = "$k"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
177 |
found=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
178 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
179 |
done |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
180 |
if test $found -ne 1; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
181 |
AC_MSG_ERROR([kernel $kernele100 not available for e100 driver!]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
182 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
183 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
184 |
AC_MSG_RESULT([$kernele100]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
185 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
186 |
|
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
187 |
AC_SUBST(KERNEL_E100,[$kernele100]) |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
188 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
189 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
190 |
# forcedeth driver |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
191 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
192 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
193 |
AC_ARG_ENABLE([forcedeth], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
194 |
AS_HELP_STRING([--enable-forcedeth], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
195 |
[Enable forcedeth driver]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
196 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
197 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
198 |
yes) enableforcedeth=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
199 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
200 |
no) enableforcedeth=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
201 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
202 |
*) AC_MSG_ERROR([Invalid value for --enable-forcedeth]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
203 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
204 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
205 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
206 |
[enableforcedeth=0] # disabled by default! |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
207 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
208 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
209 |
AM_CONDITIONAL(ENABLE_FORCEDETH, test "x$enableforcedeth" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
210 |
AC_SUBST(ENABLE_FORCEDETH,[$enableforcedeth]) |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
211 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
212 |
AC_ARG_WITH([forcedeth-kernel], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
213 |
AC_HELP_STRING( |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
214 |
[--with-forcedeth-kernel=<X.Y.Z>], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
215 |
[forcedeth kernel (only if differing)] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
216 |
), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
217 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
218 |
kernelforcedeth=[$withval] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
219 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
220 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
221 |
kernelforcedeth=$linuxversion |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
222 |
] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
223 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
224 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
225 |
if test "x${enableforcedeth}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
226 |
AC_MSG_CHECKING([for kernel for forcedeth driver]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
227 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
228 |
kernels=`ls -1 devices/ | grep -oE "^forcedeth-.*-" | cut -d "-" -f 2 | uniq` |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
229 |
found=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
230 |
for k in $kernels; do |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
231 |
if test "$kernelforcedeth" = "$k"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
232 |
found=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
233 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
234 |
done |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
235 |
if test $found -ne 1; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
236 |
AC_MSG_ERROR([kernel $kernelforcedeth not available for forcedeth driver!]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
237 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
238 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
239 |
AC_MSG_RESULT([$kernelforcedeth]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
240 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
241 |
|
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
242 |
AC_SUBST(KERNEL_FORCEDETH,[$kernelforcedeth]) |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
243 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
244 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
245 |
# e1000 driver |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
246 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
247 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
248 |
AC_ARG_ENABLE([e1000], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
249 |
AS_HELP_STRING([--enable-e1000], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
250 |
[Enable e1000 driver]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
251 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
252 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
253 |
yes) enablee1000=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
254 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
255 |
no) enablee1000=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
256 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
257 |
*) AC_MSG_ERROR([Invalid value for --enable-e1000]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
258 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
259 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
260 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
261 |
[enablee1000=0] # disabled by default |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
262 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
263 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
264 |
AM_CONDITIONAL(ENABLE_E1000, test "x$enablee1000" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
265 |
AC_SUBST(ENABLE_E1000,[$enablee1000]) |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
266 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
267 |
AC_ARG_WITH([e1000-kernel], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
268 |
AC_HELP_STRING( |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
269 |
[--with-e1000-kernel=<X.Y.Z>], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
270 |
[e1000 kernel (only if differing)] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
271 |
), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
272 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
273 |
kernele1000=[$withval] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
274 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
275 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
276 |
kernele1000=$linuxversion |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
277 |
] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
278 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
279 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
280 |
if test "x${enablee1000}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
281 |
AC_MSG_CHECKING([for kernel for e1000 driver]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
282 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
283 |
kernels=`ls -1 devices/e1000/ | grep -oE "^e1000_main-.*" | cut -d "-" -f 2 | uniq` |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
284 |
found=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
285 |
for k in $kernels; do |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
286 |
if test "$kernele1000" = "$k"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
287 |
found=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
288 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
289 |
done |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
290 |
if test $found -ne 1; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
291 |
AC_MSG_ERROR([kernel $kernele1000 not available for e1000 driver!]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
292 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
293 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
294 |
AC_MSG_RESULT([$kernele1000]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
295 |
fi |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
296 |
|
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
297 |
AC_SUBST(KERNEL_E1000,[$kernele1000]) |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
298 |
|
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
299 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
300 |
# RTAI path (optional) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
301 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
302 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
303 |
AC_ARG_WITH([rtai-dir], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
304 |
AC_HELP_STRING( |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
305 |
[--with-rtai-dir=<DIR>], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
306 |
[RTAI path (only for RTAI examples)] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
307 |
), |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
308 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
309 |
rtaidir=[$withval] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
310 |
], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
311 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
312 |
rtaidir="" |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
313 |
] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
314 |
) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
315 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
316 |
AC_MSG_CHECKING([for RTAI path]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
317 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
318 |
if test -z "${rtaidir}"; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
319 |
AC_MSG_RESULT([not specified.]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
320 |
else |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
321 |
if test \! -r ${rtaidir}/include/rtai.h; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
322 |
AC_MSG_ERROR([no RTAI installation found in ${rtaidir}!]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
323 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
324 |
AC_MSG_RESULT([$rtaidir]) |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
325 |
fi |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
326 |
|
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
327 |
AC_SUBST(RTAI_DIR,[$rtaidir]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
328 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
329 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
330 |
# MSR path (optional) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
331 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
332 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
333 |
AC_ARG_WITH([msr-dir], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
334 |
AC_HELP_STRING( |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
335 |
[--with-msr-dir=<DIR>], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
336 |
[MSR path (only for MSR example)] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
337 |
), |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
338 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
339 |
msrdir=[$withval] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
340 |
], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
341 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
342 |
msrdir="" |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
343 |
] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
344 |
) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
345 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
346 |
AC_MSG_CHECKING([for MSR path]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
347 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
348 |
if test -z "${msrdir}"; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
349 |
AC_MSG_RESULT([not specified.]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
350 |
else |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
351 |
if test \! -r ${msrdir}/include/msr.h; then |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
352 |
AC_MSG_ERROR([no MSR installation found in ${msrdir}!]) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
353 |
fi |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
354 |
AC_MSG_RESULT([$msrdir]) |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
355 |
fi |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
356 |
|
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
357 |
AC_SUBST(MSR_DIR,[$msrdir]) |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
358 |
|
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
359 |
#------------------------------------------------------------------------------ |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
360 |
# Debug interface |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
361 |
#------------------------------------------------------------------------------ |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
362 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
363 |
AC_ARG_ENABLE([debug-if], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
364 |
AS_HELP_STRING([--enable-debug-if], |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
365 |
[Create a debug interface for each master @<:@NO@:>@]), |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
366 |
[ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
367 |
case "${enableval}" in |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
368 |
yes) dbg=1 |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
369 |
;; |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
370 |
no) dbg=0 |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
371 |
;; |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
372 |
*) AC_MSG_ERROR([Invalid value for --enable-debug-if]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
373 |
;; |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
374 |
esac |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
375 |
], |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
376 |
[dbg=0] |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
377 |
) |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
378 |
|
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
379 |
if test "x${dbg}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
380 |
AC_DEFINE([EC_DEBUG_IF], [1], [Debug interfaces enabled]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
381 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
382 |
AM_CONDITIONAL(ENABLE_DEBUG_IF, test "x$dbg" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
383 |
AC_SUBST(ENABLE_DEBUG_IF,[$dbg]) |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
384 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
385 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
386 |
# Debug ring |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
387 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
388 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
389 |
AC_ARG_ENABLE([debug-ring], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
390 |
AS_HELP_STRING([--enable-debug-ring], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
391 |
[Create a debug ring to record frames @<:@NO@:>@]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
392 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
393 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
394 |
yes) debugring=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
395 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
396 |
no) debugring=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
397 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
398 |
*) AC_MSG_ERROR([Invalid value for --enable-debug-ring]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
399 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
400 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
401 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
402 |
[debugring=0] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
403 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
404 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
405 |
if test "x${debugring}" = "x1"; then |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
406 |
AC_DEFINE([EC_DEBUG_RING], [1], [Debug ring enabled]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
407 |
fi |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
408 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
409 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
410 |
# Dummy master module |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
411 |
#------------------------------------------------------------------------------ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
412 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
413 |
AC_ARG_ENABLE([dummy], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
414 |
AS_HELP_STRING([--enable-dummy], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
415 |
[Build the dummy master module @<:@NO@:>@]), |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
416 |
[ |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
417 |
case "${enableval}" in |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
418 |
yes) dummy=1 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
419 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
420 |
no) dummy=0 |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
421 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
422 |
*) AC_MSG_ERROR([Invalid value for --enable-dummy]) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
423 |
;; |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
424 |
esac |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
425 |
], |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
426 |
[dummy=0] |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
427 |
) |
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
428 |
|
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
429 |
AM_CONDITIONAL(ENABLE_DUMMY, test "x$dummy" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
430 |
AC_SUBST(ENABLE_DUMMY,[$dummy]) |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
431 |
|
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
432 |
#------------------------------------------------------------------------------ |
1745
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
433 |
# Ethernet-over-EtherCAT support |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
434 |
#------------------------------------------------------------------------------ |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
435 |
|
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
436 |
AC_ARG_ENABLE([eoe], |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
437 |
AS_HELP_STRING([--enable-eoe], |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
438 |
[Enable EoE support (default: yes)]), |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
439 |
[ |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
440 |
case "${enableval}" in |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
441 |
yes) eoe=1 |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
442 |
;; |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
443 |
no) eoe=0 |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
444 |
;; |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
445 |
*) AC_MSG_ERROR([Invalid value for --enable-eoe]) |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
446 |
;; |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
447 |
esac |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
448 |
], |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
449 |
[eoe=1] |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
450 |
) |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
451 |
|
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
452 |
if test "x${eoe}" = "x1"; then |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
453 |
AC_DEFINE([EC_EOE], [1], [EoE support enabled]) |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
454 |
fi |
07fd94c5119d
MERGE -r908:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk (1.3.1 changes)
Florian Pose <fp@igh-essen.com>
parents:
1744
diff
changeset
|
455 |
AM_CONDITIONAL(ENABLE_EOE, test "x$eoe" = "x1") |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
456 |
AC_SUBST(ENABLE_EOE,[$eoe]) |
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
457 |
|
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
458 |
#------------------------------------------------------------------------------ |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
459 |
|
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
460 |
AC_CONFIG_FILES([ |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
461 |
Doxyfile |
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
462 |
Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
463 |
Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
464 |
master/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
465 |
master/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
466 |
devices/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
467 |
devices/Makefile |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
468 |
devices/e1000/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
469 |
devices/e1000/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
470 |
script/Makefile |
1740
fa0af75bfbe9
MERGE -r759:762 trunk -> branches/stable-1.2 (release 1.2, part two).
Florian Pose <fp@igh-essen.com>
parents:
1739
diff
changeset
|
471 |
script/init.d/Makefile |
fa0af75bfbe9
MERGE -r759:762 trunk -> branches/stable-1.2 (release 1.2, part two).
Florian Pose <fp@igh-essen.com>
parents:
1739
diff
changeset
|
472 |
script/sysconfig/Makefile |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
473 |
include/Makefile |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
474 |
examples/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
475 |
examples/mini/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
476 |
examples/mini/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
477 |
examples/rtai/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
478 |
examples/rtai/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
479 |
examples/msr/Kbuild |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
480 |
examples/msr/Makefile |
1746
72e7507b3f1b
merge -r931:HEAD svn://yak/vol/projekte/msr_messen_steuern_regeln/ethercat/rep/trunk .
Florian Pose <fp@igh-essen.com>
parents:
1745
diff
changeset
|
481 |
dummy/Kbuild |
1744
7bc131b92039
MERGE trunk -r770:907 -> branches-1.3 (1.3 changes)
Florian Pose <fp@igh-essen.com>
parents:
1740
diff
changeset
|
482 |
dummy/Makefile |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1727
diff
changeset
|
483 |
]) |
1724
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
484 |
AC_OUTPUT |
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
485 |
|
07c82e520ddd
MERGE trunk -r546:550 -> branches/stable-1.1 (Bugfix, Autotools, still w/o XML)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
486 |
#------------------------------------------------------------------------------ |