bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Florian Pose 2006-10-24 12:06:59 +00:00
parent b25fdd525b
commit 459841ea00
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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}

65
configure.ac
View File

@ -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
AC_MSG_CHECKING([for Linux kernel sources])
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
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})