Changeset 7018


Ignore:
Timestamp:
08/13/10 14:55:15 (4 years ago)
Author:
wehart
Message:

Update from bootstrap

File:
1 edited

Legend:

Unmodified
Added
Removed
  • acro-utilib/trunk/configure.ac

    r6939 r7018  
    5050#endif 
    5151#ifdef ACRO_USING_UTILIB 
    52 #include <utilib/utilib_config.h> 
     52#include <utilib_config.h> 
    5353#endif 
    5454) 
     
    239239# 
    240240pwd=`pwd` 
    241 if test -d $pwd/tpl/tinyxml; then 
    242    new_configure_args="$ac_configure_args --with-tinyxml=$pwd/tpl/tinyxml" 
    243    ac_configure_args="$new_configure_args" 
    244 fi 
    245241if test -d tpl/cxxtest; then 
    246242   new_configure_args="$ac_configure_args --with-cxxtest=$pwd/tpl/cxxtest" 
     
    833829# colin 
    834830ACRO_ARG_ENABLE_PACKAGE(colin, COLIN, colin, 
    835        ${srcdir}/packages/colin/colin/real.h, yes) 
     831       ${srcdir}/packages/colin/Makefile.am, yes) 
    836832if test X${ac_cv_enable_colin} = Xyes ; then 
    837833   if test -d ${srcdir}/packages/colin ; then 
     
    840836      AC_CONFIG_FILES([packages/colin/Makefile:packages/colin/Makefile.in:packages/dummy/Makefile.in]) 
    841837      AC_CONFIG_FILES([packages/colin/doc/Makefile:packages/colin/doc/Makefile.in:packages/dummy/Makefile.in]) 
    842       AC_CONFIG_FILES([packages/colin/colin/Makefile:packages/colin/colin/Makefile.in:packages/dummy/Makefile.in]) 
    843838      AC_CONFIG_FILES([packages/colin/test/Makefile:packages/colin/test/Makefile.in:packages/dummy/Makefile.in]) 
    844839      AC_CONFIG_FILES([packages/colin/test/studies/Makefile:packages/colin/test/studies/Makefile.in:packages/dummy/Makefile.in]) 
     
    851846# scolib 
    852847ACRO_ARG_ENABLE_PACKAGE(scolib, SCOLIB, scolib, 
    853        ${srcdir}/packages/scolib/src/lib/PatternSearch.cpp, yes) 
     848       ${srcdir}/packages/scolib/Makefile.am, yes) 
    854849if test X${ac_cv_enable_scolib} = Xyes ; then 
    855850   if test -d ${srcdir}/packages/scolib ; then 
     
    857852      AC_CONFIG_FILES([packages/scolib/doc/Makefile:packages/scolib/doc/Makefile.in:packages/dummy/Makefile.in]) 
    858853      AC_CONFIG_FILES([packages/scolib/src/Makefile:packages/scolib/src/Makefile.in:packages/dummy/Makefile.in]) 
    859       AC_CONFIG_FILES([packages/scolib/scolib/Makefile:packages/scolib/scolib/Makefile.in:packages/dummy/Makefile.in]) 
    860854      AC_CONFIG_FILES([packages/scolib/test/Makefile:packages/scolib/test/Makefile.in:packages/dummy/Makefile.in]) 
    861855   fi 
     
    977971      AC_CONFIG_FILES([packages/interfaces/Makefile:packages/interfaces/Makefile.in:packages/dummy/Makefile.in]) 
    978972      AC_CONFIG_FILES([packages/interfaces/doc/Makefile:packages/interfaces/doc/Makefile.in:packages/dummy/Makefile.in]) 
    979       AC_CONFIG_FILES([packages/interfaces/interfaces/Makefile:packages/interfaces/interfaces/Makefile.in:packages/dummy/Makefile.in]) 
    980973      AC_CONFIG_FILES([packages/interfaces/test/Makefile:packages/interfaces/test/Makefile.in:packages/dummy/Makefile.in]) 
    981974      AC_CONFIG_FILES([packages/interfaces/src/Makefile:packages/interfaces/src/Makefile.in:packages/dummy/Makefile.in]) 
     
    11311124 
    11321125# tinyxml 
     1126ACX_TINYXML([tpl/tinyxml]) 
    11331127ACRO_ARG_ENABLE_PACKAGE(tinyxml, TINYXML, tinyxml, 
    1134        ${srcdir}/tpl/tinyxml/Makefile.am, yes) 
     1128       ${srcdir}/tpl/tinyxml/Makefile.am, $acx_tinyxml_ok) 
    11351129if test X${ac_cv_enable_tinyxml} = Xyes ; then 
    11361130   if test -d ${srcdir}/tpl/tinyxml ; then 
Note: See TracChangeset for help on using the changeset viewer.