COIN-OR::LEMON - Graph Library

Changeset 1304:c9c2e90b2342 in lemon-0.x


Ignore:
Timestamp:
04/05/05 10:43:51 (15 years ago)
Author:
Akos Ladanyi
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1741
Message:

Merged my branch (branches/akos) changes r1654:1740 into the trunk.

Files:
2 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • bootstrap

    r542 r1304  
    1 #! /bin/sh
    2 aclocal-1.7 \
    3 && automake-1.7 --gnu --add-missing \
    4 && autoconf
     1#!/bin/bash
     2
     3prev=
     4for option
     5do
     6  if test -n "$prev"
     7  then
     8    eval "$prev=\$option"
     9    prev=
     10    continue
     11  fi
     12
     13  optarg=`expr "x$option" : 'x[^=]*=\(.*\)'`
     14
     15  case $option in
     16
     17  -amver | --amver)
     18    prev=amver ;;
     19  -amver=* | --amver=*)
     20    amver=$optarg ;;
     21
     22  -acver | --acver)
     23    prev=acver ;;
     24  -acver=* | --acver=*)
     25    acver=$optarg ;;
     26
     27  --help | -h)
     28    cat << EOF
     29Usage: $0 [OPTION]
     30
     31Options:
     32  -h, --help            display this help and exit
     33      --amver=VERSION   use VERSION version of automake
     34      --acver=VERSION   use VERSION version of autoconf
     35
     36Expamle:
     37  $0 --amver=1.8 --acver=2.59
     38EOF
     39    exit 0
     40    ;;
     41
     42  *)
     43    cat << EOF >&2
     44$0: unrecognized option: $option
     45Try \`$0 --help' for more information.
     46EOF
     47    exit 1
     48    ;;
     49
     50  esac
     51done
     52
     53automake=automake
     54aclocal=aclocal
     55autoconf=autoconf
     56
     57if test -n "$amver"
     58then
     59  automake=automake-$amver
     60  aclocal=aclocal-$amver
     61fi
     62
     63if test -n "$acver"
     64then
     65  autoconf=autoconf-$acver
     66fi
     67
     68$aclocal \
     69&& libtoolize --force --copy \
     70&& $automake --add-missing --copy --gnu \
     71&& $autoconf
  • configure.ac

    r1171 r1304  
    77
    88dnl Checks for programs.
    9 AC_PROG_CC
    109AC_PROG_CXX
     10AC_PROG_INSTALL
     11AC_PROG_LIBTOOL
    1112
    1213CXXFLAGS="$CXXFLAGS -Wall"
     
    2829AC_CHECK_FUNCS(gettimeofday times ctime_r)
    2930
    30 AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lemon/Makefile src/test/Makefile src/benchmark/Makefile src/demo/Makefile autopackage/default.apspec])
     31AC_CONFIG_FILES([
     32Makefile
     33autopackage/default.apspec
     34doc/Makefile
     35doc/Doxyfile
     36src/Makefile
     37src/lemon/Makefile
     38src/lemon/lemon.pc
     39src/benchmark/Makefile
     40src/demo/Makefile
     41src/test/Makefile
     42])
    3143AC_OUTPUT
  • src/lemon/Makefile.am

    r1217 r1304  
     1AM_CPPFLAGS = -I$(top_srcdir)/src
     2
     3pkgconfigdir = $(libdir)/pkgconfig
     4pkgconfig_DATA = lemon.pc
     5
     6lib_LTLIBRARIES = libemon.la
     7libemon_la_SOURCES =
     8
    19pkginclude_HEADERS =                                                    \
    210        array_map.h                                                     \
Note: See TracChangeset for help on using the changeset viewer.