Skip to content
Snippets Groups Projects
Commit 0a662aa0 authored by Florian Pose's avatar Florian Pose
Browse files

Altered configure --with-linux parameter to --with-linux-dir; removed depmod call.

parent d0c02b91
No related branches found
No related tags found
No related merge requests found
...@@ -37,9 +37,6 @@ DIST_SUBDIRS = master devices script include examples ...@@ -37,9 +37,6 @@ DIST_SUBDIRS = master devices script include examples
EXTRA_DIST = documentation/ethercat_doc.pdf EXTRA_DIST = documentation/ethercat_doc.pdf
install-data-local:
$(DEPMOD) -b "$(DESTDIR)" $(LINUX_KERNEL_VERSION)
mydist: mydist:
@SVNREV=`svnversion $(srcdir)` && \ @SVNREV=`svnversion $(srcdir)` && \
$(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-trunk-r$${SVNREV} $(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-trunk-r$${SVNREV}
......
...@@ -14,32 +14,34 @@ AC_CONFIG_SRCDIR([config.h.in]) ...@@ -14,32 +14,34 @@ AC_CONFIG_SRCDIR([config.h.in])
# Linux sources # Linux sources
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
AC_ARG_WITH([linux], AC_ARG_WITH([linux-dir],
AC_HELP_STRING( AC_HELP_STRING(
[--with-linux=<version>], [--with-linux-dir=<DIR>],
[Linux kernel version @<:@running kernel@:>@] [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]) AC_MSG_CHECKING([for Linux kernel sources])
modulesdir=/lib/modules/${version}
if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then if test \! -r ${sourcedir}/.config; then
echo
AC_MSG_ERROR([Invalid modules directory ${modulesdir}])
fi
sourcedir=`cd ${modulesdir}/build && pwd -P`
if test \! -r ${sourcedir}/Makefile; then
echo echo
AC_MSG_ERROR([No Linux kernel sources in $sourcedir]) AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
fi fi
AC_SUBST(LINUX_KERNEL_VERSION,[$version])
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
AC_SUBST(LINUX_MODULES_DIR,[$modulesdir]) AC_MSG_RESULT($LINUX_SOURCE_DIR)
AC_MSG_RESULT($LINUX_KERNEL_VERSION)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Depmod # Depmod
...@@ -56,19 +58,22 @@ fi ...@@ -56,19 +58,22 @@ fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
AC_ARG_ENABLE([debug-if], AC_ARG_ENABLE([debug-if],
AS_HELP_STRING([--enable-dbg-if], AS_HELP_STRING([--enable-dbg-if],
[Create a debug interface for each master @<:@NO@:>@]), [Create a debug interface for each master @<:@NO@:>@]),
[case "${enableval}" in [
yes) dbg=1 case "${enableval}" in
AC_DEFINE([EC_DBG_IF], [1], [Debug interfaces enabled]) yes) dbg=1
;; AC_DEFINE([EC_DBG_IF], [1], [Debug interfaces enabled])
no) dbg=0 ;;
;; no) dbg=0
*) AC_MSG_ERROR([Invalid value for --enable-dbg-if]) ;;
;; *) AC_MSG_ERROR([Invalid value for --enable-dbg-if])
esac], ;;
[dbg=0] esac
],
[dbg=0]
) )
AM_CONDITIONAL(EC_DBG_IF, test "x$dbg" = x1) AM_CONDITIONAL(EC_DBG_IF, test "x$dbg" = x1)
AC_SUBST([EC_DBG_IF],${dbg}) AC_SUBST([EC_DBG_IF],${dbg})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment