Changeset 80a6589 for configure.in


Ignore:
Timestamp:
10/10/05 16:25:16 (16 years ago)
Author:
Daniel Lawson <dlawson@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
47a9686
Parents:
9daf398
Message:

moving doxygen stuff round
created docs/Makefile.am
fixed some dag detection crazyness.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r9daf398 r80a6589  
    44AM_INIT_AUTOMAKE
    55
    6 AC_CONFIG_FILES([Makefile lib/Makefile])
     6AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile])
    77dnl GNU C library
    88dnl AC_GNU_SOURCE
     
    145145        then
    146146                want_dag=yes
    147                 dag_root=
     147                dag_root=/root/dag
    148148        else
    149149                want_dag=yes
     
    155155        #
    156156        want_dag=ifpresent
    157         dag_root=
     157        dag_root=/root/dag/
    158158])
    159159
     
    162162if test "$with_dag" != no; then
    163163        AC_MSG_CHECKING(whether we have DAG API)
    164 
    165         if test -z "$dag_root"; then
    166                 dag_root=$srcdir/../dag
    167         fi
    168164
    169165        if test -r "$dag_root/lib"; then
     
    194190                        dag2_4=true
    195191                fi
     192               
     193                AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
     194                AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
    196195        else
    197                 ac_cv_lbl_dag_api=no
    198         fi
    199         AC_MSG_RESULT($ac_cv_lbl_dag_api)
    200         if test $ac_cv_lbl_dag_api = no; then
    201196                if test "$want_dag" = yes; then
    202197                        AC_MSG_ERROR(DAG API not found under directory $dag_root
    203198; use --without-dag)
    204199                fi
    205         else
    206                 AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
    207                 AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
     200                ac_cv_lbl_dag_api=no
    208201        fi
     202        AC_MSG_RESULT($ac_cv_lbl_dag_api)
    209203else
    210204        AC_DEFINE(HAVE_DAG,0,[conditional for building with DAG support])
     
    213207AM_CONDITIONAL(HAVE_DAG, test x$ac_cv_lbl_dag_api = xyes)
    214208AM_CONDITIONAL(DAG2_4, test x$dag2_4 = xtrue)
     209
     210
     211# Check for miscellaneous programs
     212AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false])
     213
     214AM_CONDITIONAL(HAS_DOXYGEN, [test x"$has_doxygen" = xtrue])
     215
     216
    215217
    216218# The following is commented out because it seems you don't actually
Note: See TracChangeset for help on using the changeset viewer.