Changeset 4882


Ignore:
Timestamp:
Aug 18, 2014, 11:55:01 PM (3 years ago)
Author:
Sam Hocevar
Message:

build: update bootstrap script and configure.ac.

Location:
neercs/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • neercs/trunk/bootstrap

    r4366 r4882  
    99#    and/or modify it under the terms of the Do What The Fuck You Want
    1010#    To Public License, Version 2, as published by Sam Hocevar. See
    11 #    http://sam.zoy.org/wtfpl/COPYING for more details.
     11#    http://www.wtfpl.net/ for more details.
    1212#
    1313# The latest version of this script can be found at the following place:
     
    3737# Check for automake
    3838amvers="no"
    39 for v in 11 10 9 8 7 6 5; do
    40   if automake-1.${v} --version >/dev/null 2>&1; then
    41     amvers="-1.${v}"
    42     break
    43   elif automake1.${v} --version >/dev/null 2>&1; then
    44     amvers="1.${v}"
     39for v in "" "-1.15" "-1.14" "-1.13" "-1.12" "-1.11"; do
     40  if automake${v} --version > /dev/null 2>&1; then
     41    amvers=${v}
    4542    break
    4643  fi
    4744done
    4845
    49 if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
    50   amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
    51   if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
    52     amvers="no"
    53   else
    54     amvers=""
    55   fi
    56 fi
    57 
    5846if test "$amvers" = "no"; then
    59   echo "$0: you need automake version 1.5 or later"
     47  echo "$0: automake not found"
    6048  exit 1
    6149fi
     
    7159
    7260if test "$acvers" = "no"; then
    73   echo "$0: you need autoconf"
     61  echo "$0: autoconf not found"
    7462  exit 1
    7563fi
     
    9078
    9179  if test "$libtoolize" = "no"; then
    92     echo "$0: you need libtool"
     80    echo "$0: libtool not found"
    9381    exit 1
    9482  fi
     
    9886if test "$pkgconfig" = "yes"; then
    9987  if ! pkg-config --version >/dev/null 2>&1; then
    100     echo "$0: you need pkg-config"
     88    echo "$0: pkg-config not found"
    10189    exit 1
    10290  fi
     
    11098    mkdir "$auxdir"
    11199  fi
    112   aclocalflags="${aclocalflags} -I $auxdir -I ."
     100  aclocalflags="-I $auxdir -I . ${aclocalflags}"
    113101fi
     102
     103# Honour M4PATH because sometimes M4 doesn't
     104save_IFS=$IFS
     105IFS=:
     106tmp="$M4PATH"
     107for x in $tmp; do
     108  if test -n "$x"; then
     109    aclocalflags="-I $x ${aclocalflags}"
     110  fi
     111done
     112IFS=$save_IFS
    114113
    115114# Explain what we are doing from now
  • neercs/trunk/configure.ac

    r4794 r4882  
    77AC_CANONICAL_SYSTEM
    88
    9 AM_INIT_AUTOMAKE(neercs, 0.0)
    10 AM_CONFIG_HEADER(config.h)
     9AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
    1110
    1211AM_PROG_CC_C_O
    1312AC_PROG_CPP
    1413
    15 AC_CANONICAL_HOST 
     14AC_CANONICAL_HOST
    1615
    1716if test "$host_os" == "darwin10.2.0"; then
     
    179178AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
    180179
     180AM_CONFIG_HEADER(config.h)
    181181AC_CONFIG_FILES([
    182182  Makefile
Note: See TracChangeset for help on using the changeset viewer.