Author: tpot Date: 2005-10-13 01:19:46 +0000 (Thu, 13 Oct 2005) New Revision: 818
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=818 Log: Handle dia not being present more gracefully. Modified: trunk/configure.in Changeset: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2005-10-12 17:17:19 UTC (rev 817) +++ trunk/configure.in 2005-10-13 01:19:46 UTC (rev 818) @@ -19,16 +19,19 @@ DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, ALL) # Check dia version number -[ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] -DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` -DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` -if test "$DIA_MAJ_VERSION" -le "0" -then +if test -n "$DIA"; then + [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] + DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` + DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` + + if test "$DIA_MAJ_VERSION" -le "0" + then if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" then AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) fi + fi fi DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX)