Changeset 4882 for neercsTweet

Timestamp:

Aug 18, 2014, 11:55:01 PM (5 years ago)

Author:

Sam Hocevar

Message:

build: update bootstrap script and configure.ac.

Location:

neercs/trunk

Files:

• bootstrap (modified) (6 diffs)
• configure.ac (modified) (2 diffs)

neercs/trunk/bootstrap

@@ -9 +9 @@
 #    and/or modify it under the terms of the Do What The Fuck You Want
 #    To Public License, Version 2, as published by Sam Hocevar. See
-#    http://sam.zoy.org/wtfpl/COPYING for more details.
+#    http://www.wtfpl.net/ for more details.
 #
 # The latest version of this script can be found at the following place:
@@ -37 +37 @@
 # Check for automake
 amvers="no"
-for v in 11 10 9 8 7 6 5; do
-  if automake-1.${v} --version >/dev/null 2>&1; then
-    amvers="-1.${v}"
-    break
-  elif automake1.${v} --version >/dev/null 2>&1; then
-    amvers="1.${v}"
+for v in "" "-1.15" "-1.14" "-1.13" "-1.12" "-1.11"; do
+  if automake${v} --version > /dev/null 2>&1; then
+    amvers=${v}
     break
   fi
 done
 
-if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
-  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
-  if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
-    amvers="no"
-  else
-    amvers=""
-  fi
-fi
-
 if test "$amvers" = "no"; then
-  echo "$0: you need automake version 1.5 or later"
+  echo "$0: automake not found"
   exit 1
 fi
@@ -71 +59 @@
 
 if test "$acvers" = "no"; then
-  echo "$0: you need autoconf"
+  echo "$0: autoconf not found"
   exit 1
 fi
@@ -90 +78 @@
 
   if test "$libtoolize" = "no"; then
-    echo "$0: you need libtool"
+    echo "$0: libtool not found"
     exit 1
   fi
@@ -98 +86 @@
 if test "$pkgconfig" = "yes"; then
   if ! pkg-config --version >/dev/null 2>&1; then
-    echo "$0: you need pkg-config"
+    echo "$0: pkg-config not found"
     exit 1
   fi
@@ -110 +98 @@
     mkdir "$auxdir"
   fi
-  aclocalflags="${aclocalflags} -I $auxdir -I ."
+  aclocalflags="-I $auxdir -I . ${aclocalflags}"
 fi
+
+# Honour M4PATH because sometimes M4 doesn't
+save_IFS=$IFS
+IFS=:
+tmp="$M4PATH"
+for x in $tmp; do
+  if test -n "$x"; then
+    aclocalflags="-I $x ${aclocalflags}"
+  fi
+done
+IFS=$save_IFS
 
 # Explain what we are doing from now

neercs/trunk/configure.ac

@@ -7 +7 @@
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(neercs, 0.0)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
 
 AM_PROG_CC_C_O
 AC_PROG_CPP
 
-AC_CANONICAL_HOST 
+AC_CANONICAL_HOST
 
 if test "$host_os" == "darwin10.2.0"; then 
@@ -179 +178 @@
 AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
+AM_CONFIG_HEADER(config.h)
 AC_CONFIG_FILES([
   Makefile