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

Comparing trunk/OOPSE-2.0/ac-tools/aclocal.m4 (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1579 by chuckv, Fri Oct 15 19:38:12 2004 UTC

# Line 534 | Line 534 | if test "$ac_test_CFLAGS" != "set"; then
534          fi;;
535     *darwin*)
536          if test "$CC" = xlc -o "$CC" = cc; then
537 <                CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
537 >                CFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
538          fi;;
539    esac
540  
# Line 653 | Line 653 | if test "$ac_test_CXXFLAGS" != "set"; then
653          fi;;
654     *darwin*)
655          if test "$CXX" = xlc++; then
656 <                CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
656 >                CXXFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
657          fi;;
658    esac
659  
# Line 768 | Line 768 | if test x"$F90FLAGS" = x ; then
768          fi;;
769     *darwin*)
770          if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
771 <                F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
771 >                F90FLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto"
772          fi;;
773    esac
774  
# 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], [
1071 > myDir=${0%/*}
1072 > if [ "$myDir" = "$0" ]; then
1073 >    # Ran from local directory
1074 >     myDir=$PWD
1075 > fi
1076 > # Resolve symlinks.
1077 > myProgram="$0"
1078 > while [ -L "$myProgram" ]; do
1079 >    ls=`/bin/ls -ld "$myProgram"`
1080 >    link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
1081 >    if /usr/bin/expr "$link" : '.*/.*' > /dev/null; then
1082 >       myProgram="$link"
1083 >    else
1084 >       myProgram="`AS_DIRNAME([$myProgram])`/$link"
1085 >    fi
1086 > done
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