Changeset 2036Tweet

Timestamp:

Oct 20, 2012, 4:08:52 PM (7 years ago)

Author:

sam

Message:

build: check for a decent version of sed (ie. not the shitty BSD one).

Location:

trunk

Files:

• build/check-source.sh (modified) (5 diffs)
• configure.ac (modified) (2 diffs)

trunk/build/check-source.sh

@@ -29 +29 @@
 info() { if [ "$quiet" != true ]; then echo "I: $1"; fi }
 
+# Ensure the system tools do not attempt to perform multibyte conversions
+export LANG=C
+
 # Find out where the top directory is and go there
 top_srcdir="$(cd "$(dirname $0)"; cd ..; pwd)"
@@ -34 +37 @@
 
 # Check for working tools
-#if [ "$(echo foo | grep -c foo)" != 1 ]; then
-#    error "grep -c does not appear to work, cancelling"
-#    exit 0
-#fi
+if [ "$(echo foo | grep -c foo)" != 1 ]; then
+    error "grep -c does not appear to work, cancelling"
+    exit 0
+fi
+
+SED=sed
+if gsed --version >/dev/null 2>&1; then
+    SED=gsed
+fi
+if [ "$(echo 'x\x' | $SED 's/.*[^x\t]//')" != x ]; then
+    error "sed does not appear to work, cancelling"
+    exit 0
+fi
+
 if d2u -h >/dev/null 2>&1; then
     d2u=d2u
@@ -74 +87 @@
 
 OIFS="$IFS"
-IFS=$'\n'
+IFS='
+'
 if [ "$repo" = git ]; then
     FILES="`git ls-files`"
@@ -119 +133 @@
 
           # Check for trailing spaces
-          nspaces="$(LANG=C sed 's/.*[^ \t]//' "$file" | tr -cd '\t ' | wc -c)"
+          nspaces="$($SED 's/.*[^ \t]//' "$file" | tr -cd '\t ' | wc -c)"
           total_spaces="$(($total_spaces + $nspaces))"
           if [ "$nspaces" -gt 0 ]; then
               clean=false
               if [ "$fix" = true ]; then
-                  LANG=C sed -i 's/[[:space:]][[:space:]]*$//g' "$file"
+                  $SED -i 's/[[:space:]][[:space:]]*$//g' "$file"
                   info "$file has $nspaces trailing spaces"
               else
@@ -137 +151 @@
               clean=false
               if [ "$fix" = true ]; then
-                  LANG=C sed -i 's/\t/    /g' "$file"
+                  $SED -i 's/\t/    /g' "$file"
                   info "$file has $ntabs tabs"
               else

trunk/configure.ac

@@ -49 +49 @@
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
+
+
+dnl  Check for a working implementation of sed
+AC_PROG_SED
+AC_MSG_CHECKING(for a sed that understands \t)
+if test "$(echo 'x\x' | "${SED}" 's/.*@<:@^x\t@:>@//')" != x; then
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([[consider installing GNU sed]])
+else
+  AC_MSG_RESULT(yes)
+fi
+
 
 AM_CONDITIONAL(USE_GLEW, test "${ac_cv_my_have_glew}" != "no")
@@ -226 +238 @@
 ac_cv_my_have_flexlexer_h="no"
 AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS(FlexLexer.h, [ac_cv_my_have_flexlexer_h="yes"])
+AC_CHECK_HEADERS(FlexLexer.h,
+ dnl  Ensure that FlexLexer::yleng is of type int, and not size_t like
+ dnl  on recent Apple systems. It would break all our existing code.
+ [AC_MSG_CHECKING(for FlexLexer.h validity)
+  AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM([#include <FlexLexer.h>
+      class Foo : public FlexLexer
+      {
+          Foo() { int &test = yyleng; }
+      }],
+     [])],
+   [AC_MSG_RESULT(yes)
+    ac_cv_my_have_flexlexer_h="yes"],
+   [AC_MSG_RESULT(no)])])
 AC_LANG_POP(C++)
 if test "x${ac_cv_my_have_flexlexer_h}" = "xno"; then