COIN-OR::LEMON - Graph Library

Changeset 226:4c9d85f5dc93 in lemon-1.2


Ignore:
Timestamp:
07/18/08 17:47:27 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
222:f9a18c21dba8 (diff), 225:c5a40fc54f1a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r219 r226  
    77
    88AC_PREREQ([2.59])
    9 AC_INIT([LEMON], [lemon_version()], [lemon-devel@lemon.cs.elte.hu], [lemon])
     9AC_INIT([Lemon], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])
    1010AC_CONFIG_AUX_DIR([build-aux])
    1111AC_CONFIG_MACRO_DIR([m4])
     
    2626AC_CHECK_PROG([gs_found],[gs],[yes],[no])
    2727
     28dnl Set custom compiler flags when using g++.
    2829if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
    2930  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
     
    3536LX_CHECK_SOPLEX
    3637
    37 dnl Disable/enable building the demo programs
     38dnl Disable/enable building the demo programs.
    3839AC_ARG_ENABLE([demo],
    3940AS_HELP_STRING([--enable-demo], [build the demo programs])
     
    4849AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
    4950
    50 dnl Disable/enable building the binary tools
     51dnl Disable/enable building the binary tools.
    5152AC_ARG_ENABLE([tools],
    5253AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
     
    6162AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
    6263
    63 dnl Disable/enable building the benchmarks
     64dnl Disable/enable building the benchmarks.
    6465AC_ARG_ENABLE([benchmark],
    6566AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
  • configure.ac

    r225 r226  
    8989AC_CHECK_FUNCS(gettimeofday times ctime_r)
    9090
     91dnl Add dependencies on files generated by configure.
     92AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
     93  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])
     94
    9195AC_CONFIG_FILES([
    9296Makefile
  • doc/Doxyfile.in

    r219 r226  
    1616INLINE_INHERITED_MEMB  = NO
    1717FULL_PATH_NAMES        = YES
    18 STRIP_FROM_PATH        = @abs_top_srcdir@
    19 STRIP_FROM_INC_PATH    = @abs_top_srcdir@
     18STRIP_FROM_PATH        = "@abs_top_srcdir@"
     19STRIP_FROM_INC_PATH    = "@abs_top_srcdir@"
    2020SHORT_NAMES            = YES
    2121JAVADOC_AUTOBRIEF      = NO
     
    8181# configuration options related to the input files
    8282#---------------------------------------------------------------------------
    83 INPUT                  = @abs_top_srcdir@/doc \
    84                          @abs_top_srcdir@/lemon \
    85                          @abs_top_srcdir@/lemon/bits \
    86                          @abs_top_srcdir@/lemon/concepts \
    87                          @abs_top_srcdir@/demo \
    88                          @abs_top_srcdir@/tools \
    89                          @abs_top_srcdir@/test/test_tools.h
     83INPUT                  = "@abs_top_srcdir@/doc" \
     84                         "@abs_top_srcdir@/lemon" \
     85                         "@abs_top_srcdir@/lemon/bits" \
     86                         "@abs_top_srcdir@/lemon/concepts" \
     87                         "@abs_top_srcdir@/demo" \
     88                         "@abs_top_srcdir@/tools" \
     89                         "@abs_top_srcdir@/test/test_tools.h"
    9090INPUT_ENCODING         = UTF-8
    9191FILE_PATTERNS          = *.h \
     
    9797EXCLUDE_PATTERNS       =
    9898EXCLUDE_SYMBOLS        =
    99 EXAMPLE_PATH           = @abs_top_srcdir@/demo \
    100                          @abs_top_srcdir@/LICENSE \
    101                          @abs_top_srcdir@/doc
     99EXAMPLE_PATH           = "@abs_top_srcdir@/demo" \
     100                         "@abs_top_srcdir@/LICENSE" \
     101                         "@abs_top_srcdir@/doc"
    102102EXAMPLE_PATTERNS       =
    103103EXAMPLE_RECURSIVE      = NO
    104 IMAGE_PATH             = @abs_top_srcdir@/doc/images \
    105                          @abs_top_builddir@/doc/gen-images
     104IMAGE_PATH             = "@abs_top_srcdir@/doc/images" \
     105                         "@abs_top_builddir@/doc/gen-images"
    106106INPUT_FILTER           =
    107107FILTER_PATTERNS        =
  • doc/Doxyfile.in

    r224 r226  
    146146DISABLE_INDEX          = NO
    147147ENUM_VALUES_PER_LINE   = 4
    148 GENERATE_TREEVIEW      = YES
     148GENERATE_TREEVIEW      = NO
    149149TREEVIEW_WIDTH         = 250
    150150#---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.