diff options
| author | Tim Potter <tpot@samba.org> | 2005-10-13 01:19:46 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:07 -0500 |
| commit | 73c65f43f359aadbfa223c7e61dcf6b42c39d080 (patch) | |
| tree | 6cdb7b4704269855f02eee7c0ae3a20d62639ea1 /docs/configure.in | |
| parent | f9a81caccd93f12a74df0652027c033553058828 (diff) | |
| download | samba-73c65f43f359aadbfa223c7e61dcf6b42c39d080.tar.gz samba-73c65f43f359aadbfa223c7e61dcf6b42c39d080.tar.bz2 samba-73c65f43f359aadbfa223c7e61dcf6b42c39d080.zip | |
Handle dia not being present more gracefully.
(This used to be commit 71a59a3e75bbe482c3ee48e897cfbb462c269af2)
Diffstat (limited to 'docs/configure.in')
| -rw-r--r-- | docs/configure.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/configure.in b/docs/configure.in index 9d336e2320..3e4157af27 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -19,16 +19,19 @@ DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) 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) |