forked from Imagelibrary/rtems
Patch rtems-rc-19991011-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
fixes a minor configuration bug.
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
AUTOMAKE_OPTIONS = foreign 1.4
|
AUTOMAKE_OPTIONS = foreign 1.4
|
||||||
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
|
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
|
||||||
|
|
||||||
SUBDIRS= @subdirs@
|
SUBDIRS= @cfg_subdirs@ wrapup tests
|
||||||
|
|
||||||
rtems_bspdir=$(prefix)/@RTEMS_BSP@
|
rtems_bspdir=$(prefix)/@RTEMS_BSP@
|
||||||
|
|
||||||
|
|||||||
@@ -24,12 +24,12 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
|
|||||||
RTEMS_CHECK_NETWORKING(RTEMS_BSP)
|
RTEMS_CHECK_NETWORKING(RTEMS_BSP)
|
||||||
|
|
||||||
## Note: the order of the directories below is essential
|
## Note: the order of the directories below is essential
|
||||||
AC_CONFIG_SUBDIRS(make)
|
cfg_subdirs="make"
|
||||||
AC_CONFIG_SUBDIRS(exec)
|
cfg_subdirs="$cfg_subdirs exec"
|
||||||
AC_CONFIG_SUBDIRS(lib)
|
cfg_subdirs="$cfg_subdirs lib"
|
||||||
|
|
||||||
if test "$HAS_NETWORKING" = "yes"; then
|
if test "$HAS_NETWORKING" = "yes"; then
|
||||||
cfg_subdirs="libnetworking librpc"
|
cfg_subdirs="$cfg_subdirs libnetworking librpc"
|
||||||
if test "$RTEMS_HAS_RDBG" = "yes"; then
|
if test "$RTEMS_HAS_RDBG" = "yes"; then
|
||||||
RTEMS_CHECK_RDBG(RTEMS_BSP)
|
RTEMS_CHECK_RDBG(RTEMS_BSP)
|
||||||
fi
|
fi
|
||||||
@@ -44,7 +44,6 @@ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CONFIG_SUBDIRS($cfg_subdirs)
|
AC_CONFIG_SUBDIRS($cfg_subdirs)
|
||||||
AC_CONFIG_SUBDIRS(wrapup)
|
|
||||||
AC_SUBST(cfg_subdirs)
|
AC_SUBST(cfg_subdirs)
|
||||||
AC_CONFIG_SUBDIRS(tests)
|
AC_CONFIG_SUBDIRS(tests)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user