Skip to content
Snippets Groups Projects
Commit 295866a0 authored by Christian Engwer's avatar Christian Engwer
Browse files

fix AM_CONDITIONAL

[[Imported from SVN: r5243]]
parent 9f11aaf3
No related branches found
No related tags found
No related merge requests found
...@@ -584,15 +584,17 @@ AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [ ...@@ -584,15 +584,17 @@ AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [
AC_PROG_CXX AC_PROG_CXX
LT_OUTPUT LT_OUTPUT
EOF EOF
### initialize AM_CONDITIONAL for suggestions ### initialize AM_CONDITIONAL for suggestions that were not found
for name in $(eval echo \$SUGS_$mainmod); do for name in $(eval echo \$SUGS_$mainmod); do
mod=$(fix_variable_name $name) mod=$(fix_variable_name $name)
MOD=`echo $mod | tr [:lower:] [:upper:]` MOD=`echo $mod | tr [:lower:] [:upper:]`
cat >> $fname <<EOF if test "x$(eval echo \$HAVE_$mod)" = "x"; then
cat >> $fname <<EOF
### add a conditional check for $name, ### add a conditional check for $name,
# just in case the module is not available at autogen time # just in case the module is not available at autogen time
AM_CONDITIONAL([HAVE_${MOD}], false) AM_CONDITIONAL([HAVE_${MOD}], false)
EOF EOF
fi
done done
### DEPENDENCIES ### DEPENDENCIES
if test "x$SEARCH_MODULES" != "x"; then if test "x$SEARCH_MODULES" != "x"; then
...@@ -620,8 +622,6 @@ EOF ...@@ -620,8 +622,6 @@ EOF
MOD=`echo $mod | tr [:lower:] [:upper:]` MOD=`echo $mod | tr [:lower:] [:upper:]`
cat >> $fname <<EOF cat >> $fname <<EOF
### check suggestion $name ### check suggestion $name
# add a conditional check, just in case the module is not available
AM_CONDITIONAL([HAVE_${MOD}])
# invoke checks required by this module # invoke checks required by this module
AC_REQUIRE([${MOD}_CHECKS]) AC_REQUIRE([${MOD}_CHECKS])
# invoke check for this module # invoke check for this module
......
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