ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/ac-tools/aclocal.m4
(Generate patch)

Comparing trunk/OOPSE-3.0/ac-tools/aclocal.m4 (file contents):
Revision 1516 by gezelter, Fri Oct 1 21:22:27 2004 UTC vs.
Revision 1540 by gezelter, Wed Oct 6 23:03:34 2004 UTC

# Line 1055 | Line 1055 | AC_DEFUN([adl_FUNC_GETOPT_LONG],
1055   AC_DEFUN([adl_FUNC_GETOPT_LONG],
1056   [AC_PREREQ(2.49)dnl
1057    # clean out junk possibly left behind by a previous configuration
1058 <  rm -f utils/getopt.h
1058 >  rm -f src/utils/getopt.h
1059    # Check for getopt_long support
1060    AC_CHECK_HEADERS([getopt.h])
1061    AC_CHECK_FUNCS([getopt_long],,
# Line 1064 | Line 1064 | AC_DEFUN([adl_FUNC_GETOPT_LONG],
1064       [# use the GNU replacement
1065        AC_LIBOBJ(getopt)
1066        AC_LIBOBJ(getopt1)
1067 <      AC_CONFIG_LINKS([utils/getopt.h:utils/gnugetopt.h])])])])
1067 >      AC_CONFIG_LINKS([src/utils/getopt.h:src/utils/gnugetopt.h])])])])
1068  
1069  
1070   AC_DEFUN([ACX_CONFIG_HOME], [
# Line 1087 | Line 1087 | CONFIG_HOME=$myDir
1087   myDir=`AS_DIRNAME([$myProgram])`
1088   fi
1089   CONFIG_HOME=$myDir
1090 + ])
1091 +
1092 + AC_DEFUN(BB_ENABLE_DOXYGEN,
1093 + [
1094 + AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
1095 + AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])              
1096 + AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])              
1097 + AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])              
1098 + if test "x$enable_doxygen" = xno; then
1099 +        enable_doc=no
1100 + else
1101 +        AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
1102 +        if test "x$DOXYGEN" = x; then
1103 +                if test "x$enable_doxygen" = xyes; then
1104 +                        AC_MSG_ERROR([could not find doxygen])
1105 +                fi
1106 +                enable_doc=no
1107 +        else
1108 +                enable_doc=yes
1109 +                AC_PATH_PROG(DOT, dot, , $PATH)
1110 +        fi
1111 + fi
1112 +
1113 + if test "x$enable_doc" = xyes; then
1114 +  DOC=1
1115 + else
1116 +  DOC=0
1117 + fi
1118 + AC_SUBST(DOC)
1119 +
1120 + if test x$DOT = x; then
1121 +        if test "x$enable_dot" = xyes; then
1122 +                AC_MSG_ERROR([could not find dot])
1123 +        fi
1124 +        enable_dot=no
1125 + else
1126 +        enable_dot=yes
1127 + fi
1128 + AC_SUBST(enable_dot)
1129 + AC_SUBST(enable_html_docs)
1130 + AC_SUBST(enable_latex_docs)
1131   ])
1132 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines