Changeset 5366

Timestamp:

Oct 18, 2005, 9:16:10 AM (21 years ago)

Author:

desonia

Message:

changes from rel8 branch.

Location:

trunk/psModules

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• test/imsubtract/Makefile.am (modified) (1 diff)

trunk/psModules/Makefile.am

@@ -8 +8 @@
 EXTRA_DIST = Doxyfile.in psmodule-config.in psmodule.pc.in
 
+if DOXYGEN
+
 docs: Doxyfile $(prefix)/docs/psmodule $(mandir)/man3
-        $(DOXYGEN)
+        doxygen Doxyfile
         mv -f $(prefix)/docs/psmodule/man/man3/* $(mandir)/man3
         rm -rf $(prefix)/docs/psmodule/man
@@ -24 +26 @@
 CLEANFILES = $(prefix)/docs/psmodule/*
 
+endif
+
 test: check

trunk/psModules/configure.ac

@@ -47 +47 @@
 dnl doxygen -------------------------------------------------------------------
 
-AC_PATH_PROG([DOXYGEN], [doxygen], [missing])
-if test "$DOXYGEN" = "missing" ; then
-  AC_MSG_ERROR([doxygen is required])
-fi
-
-dnl needed by doxygen
-AC_PATH_PROG([PERL], [perl], [missing])
-if test "$PERL" = "missing" ; then
-  AC_MSG_ERROR([perl is required])
-fi
+AC_CHECK_PROG([doxygen], [doxygen], [true], [false])
+AM_CONDITIONAL(DOXYGEN, test x$doxygen = xtrue)
 
 dnl pslib ---------------------------------------------------------------------

trunk/psModules/test/imsubtract/Makefile.am

@@ -11 +11 @@
 
 tst_pmImageSubtract_SOURCES = tst_pmImageSubtract.c
-tst_pmSubstractBias_SOURCES = tst_pmSubstractBias.c
-tst_pmSubstractSky_SOURCES = tst_pmSubstractSky.c
+tst_pmSubtractBias_SOURCES = tst_pmSubtractBias.c
+tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
 
 check_PROGRAMS = $(TESTS)