From 0a662aa0b5875b4b6d032b1554316b3168ca1fe4 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Tue, 24 Oct 2006 12:06:59 +0000
Subject: [PATCH] Altered configure --with-linux parameter to --with-linux-dir;
removed depmod call.
---
Makefile.am | 3 ---
configure.ac | 65 ++++++++++++++++++++++++++++------------------------
2 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8e8337af..66c12f1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,9 +37,6 @@ DIST_SUBDIRS = master devices script include examples
EXTRA_DIST = documentation/ethercat_doc.pdf
-install-data-local:
- $(DEPMOD) -b "$(DESTDIR)" $(LINUX_KERNEL_VERSION)
-
mydist:
@SVNREV=`svnversion $(srcdir)` && \
$(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-trunk-r$${SVNREV}
diff --git a/configure.ac b/configure.ac
index 00ae13c6..51d4cc37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,32 +14,34 @@ AC_CONFIG_SRCDIR([config.h.in])
# Linux sources
#------------------------------------------------------------------------------
-AC_ARG_WITH([linux],
+AC_ARG_WITH([linux-dir],
AC_HELP_STRING(
- [--with-linux=<version>],
- [Linux kernel version @<:@running kernel@:>@]
+ [--with-linux-dir=<DIR>],
+ [Linux kernel sources @<:@running kernel@:>@]
),
- [version=[$withval]],
- [version=[`uname -r`]]
+ [
+ sourcedir=[$withval]
+ ],
+ [
+ version=[`uname -r`]
+ modulesdir=/lib/modules/${version}
+ if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then
+ echo
+ AC_MSG_ERROR([Invalid modules directory ${modulesdir}])
+ fi
+ sourcedir=`cd ${modulesdir}/build && pwd -P`
+ ]
)
-AC_MSG_CHECKING([for Linux kernel])
-modulesdir=/lib/modules/${version}
-if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then
- echo
- AC_MSG_ERROR([Invalid modules directory ${modulesdir}])
-fi
-sourcedir=`cd ${modulesdir}/build && pwd -P`
-if test \! -r ${sourcedir}/Makefile; then
+AC_MSG_CHECKING([for Linux kernel sources])
+
+if test \! -r ${sourcedir}/.config; then
echo
- AC_MSG_ERROR([No Linux kernel sources in $sourcedir])
+ AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
fi
-AC_SUBST(LINUX_KERNEL_VERSION,[$version])
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
-AC_SUBST(LINUX_MODULES_DIR,[$modulesdir])
-
-AC_MSG_RESULT($LINUX_KERNEL_VERSION)
+AC_MSG_RESULT($LINUX_SOURCE_DIR)
#------------------------------------------------------------------------------
# Depmod
@@ -56,19 +58,22 @@ fi
#------------------------------------------------------------------------------
AC_ARG_ENABLE([debug-if],
- AS_HELP_STRING([--enable-dbg-if],
- [Create a debug interface for each master @<:@NO@:>@]),
- [case "${enableval}" in
- yes) dbg=1
- AC_DEFINE([EC_DBG_IF], [1], [Debug interfaces enabled])
- ;;
- no) dbg=0
- ;;
- *) AC_MSG_ERROR([Invalid value for --enable-dbg-if])
- ;;
- esac],
- [dbg=0]
+ AS_HELP_STRING([--enable-dbg-if],
+ [Create a debug interface for each master @<:@NO@:>@]),
+ [
+ case "${enableval}" in
+ yes) dbg=1
+ AC_DEFINE([EC_DBG_IF], [1], [Debug interfaces enabled])
+ ;;
+ no) dbg=0
+ ;;
+ *) AC_MSG_ERROR([Invalid value for --enable-dbg-if])
+ ;;
+ esac
+ ],
+ [dbg=0]
)
+
AM_CONDITIONAL(EC_DBG_IF, test "x$dbg" = x1)
AC_SUBST([EC_DBG_IF],${dbg})
--
GitLab