Eirik Hatlen / gammalib

Commit 6e4595477b84888c75aa14f01c1382414d076bd3

Authored by Jürgen Knödlseder
1 parent f6f4f315

Add AM_CONDITIONAL statements. 

On Mac OS X 10.4, ./autogen.sh complained about missing AM_CONDITIONAL statements for a number of Doxygen parameters (see Bug #436). To solve this problem, I added the required conditionals at the end. Hopefully they do not interfer with the rest. But on Mac OS X 10.6, this seemed to work.
Inline Side-by-side
Showing 1 changed file with 14 additions and 1 deletions
m4/ax_prog_doxygen.m4
  View file @6e45954
... ... @@ -519,7 +519,7 @@ a4wide|a4|letter|legal|executive)
519 519 ;;
520 520 esac
521 521  
522   -#For debugging:
  522 +# For debugging:
523 523 #echo DX_FLAG_doc=$DX_FLAG_doc
524 524 #echo DX_FLAG_dot=$DX_FLAG_dot
525 525 #echo DX_FLAG_man=$DX_FLAG_man
... ... @@ -531,5 +531,18 @@ esac
531 531 #echo DX_FLAG_pdf=$DX_FLAG_pdf
532 532 #echo DX_FLAG_ps=$DX_FLAG_ps
533 533 #echo DX_ENV=$DX_ENV
  534 +
  535 +# Conditionals kluge for old automake versions
  536 +if test "x$DX_FLAG_doc" = "x1"; then
  537 + AM_CONDITIONAL(DX_COND_doc, test "x$DX_FLAG_doc" = "x1")
  538 + AM_CONDITIONAL(DX_COND_html, test "x$DX_FLAG_html" = "x1")
  539 + AM_CONDITIONAL(DX_COND_chm, test "x$DX_FLAG_chm" = "x1")
  540 + AM_CONDITIONAL(DX_COND_chi, test "x$DX_FLAG_chi" = "x1")
  541 + AM_CONDITIONAL(DX_COND_man, test "x$DX_FLAG_man" = "x1")
  542 + AM_CONDITIONAL(DX_COND_rtf, test "x$DX_FLAG_rtf" = "x1")
  543 + AM_CONDITIONAL(DX_COND_xml, test "x$DX_FLAG_xml" = "x1")
  544 + AM_CONDITIONAL(DX_COND_ps, test "x$DX_FLAG_ps" = "x1")
  545 + AM_CONDITIONAL(DX_COND_pdf, test "x$DX_FLAG_pdf" = "x1")
  546 +fi
534 547 ])
535 548  
... ...