diff options
author | Jonathan Adams <t12nslookup@gmail.com> | 2012-03-16 19:54:50 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-03-16 22:18:41 +0100 |
commit | ede2421f5c55366f3dea77fef5d580c47ed9eebc (patch) | |
tree | eb1ac1259afee586cf331eb65b4c1f7dcb942320 /configure.in | |
parent | solaris/gcc: add missing standard includes (diff) | |
download | core-ede2421f5c55366f3dea77fef5d580c47ed9eebc.tar.gz core-ede2421f5c55366f3dea77fef5d580c47ed9eebc.zip |
configure.in: use $GREP for non-standard features
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/configure.in b/configure.in index 4fc314acaf03..e44f01488219 100644 --- a/configure.in +++ b/configure.in @@ -30,8 +30,8 @@ PathFormat() if test "$pf_conv_to_dos" = "yes"; then formatted_path=`cygpath -d "$formatted_path"` fi - fp_count_colon=`echo "$formatted_path" | grep -c "[:]"` - fp_count_slash=`echo "$formatted_path" | grep -c "[/]"` + fp_count_colon=`echo "$formatted_path" | $GREP -c "[:]"` + fp_count_slash=`echo "$formatted_path" | $GREP -c "[/]"` if test "$fp_count_slash$fp_count_colon" != "00"; then if test "$fp_count_colon" = "0"; then formatted_path=`realpath "$formatted_path"` @@ -2758,7 +2758,7 @@ if test "$_os" = "WINNT"; then else AC_MSG_CHECKING([the compiler is MinGW]) MACHINE_PREFIX=`$CC -dumpmachine` - if echo $MACHINE_PREFIX | grep -q mingw32; then + if echo $MACHINE_PREFIX | $GREP -q mingw32; then COMPATH=`echo "$COMPATH" | sed -e 's,/bin$,,'` AC_MSG_RESULT([yes]) else @@ -3592,7 +3592,7 @@ if test -z "$GNUMAKE"; then fi AC_MSG_CHECKING([the GNU make version]) -_make_version=`$GNUMAKE --version | grep GNU | grep -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; +_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "038200"; then AC_MSG_RESULT([$GNUMAKE $_make_version]) @@ -3771,7 +3771,7 @@ dnl =================================================================== if test $_os = Darwin; then AC_MSG_CHECKING([for bogus pkg-config]) if test -n "$PKG_CONFIG"; then - if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then + if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then AC_MSG_RESULT([yes, from Mono]) else AC_MSG_RESULT([yes, from unknown origin]) @@ -4124,7 +4124,7 @@ if test "$GXX" = "yes"; then if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then with_gxx_include_path="/usr/include" fi - if echo $with_gxx_include_path | grep -q linux; then + if echo $with_gxx_include_path | $GREP -q linux; then # workaround for Mandriva - issue 100049 with_gxx_include_path=`cd $with_gxx_include_path && pwd` fi @@ -4606,7 +4606,7 @@ if test "$with_alloc" = "system"; then fi if test "$with_alloc" = "tcmalloc"; then AC_MSG_RESULT(tcmalloc) - if ! echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then + if ! echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then AC_MSG_ERROR([tcmalloc only available/usable on ix86]) fi AC_CHECK_LIB([tcmalloc], [malloc], [:], @@ -4744,15 +4744,15 @@ if test "$SOLAR_JAVA" != ""; then # Why is this necessary, we don't link with any library from the JDK I think, shortjdkhome=`cygpath -d "$with_jdk_home"` - if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then + if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit]) AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK]) - elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != "" >/dev/null; then + elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" != "" >/dev/null; then AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit]) AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK]) fi - if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then + if test x`echo "$JAVAINTERPRETER" | $GREP -i '\.exe$'` = x; then JAVAINTERPRETER="${JAVAINTERPRETER}.exe" fi JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` @@ -4784,17 +4784,17 @@ if test "$SOLAR_JAVA" != ""; then AC_MSG_CHECKING([the installed JDK]) if test -n "$JAVAINTERPRETER"; then dnl java -version sends output to stderr! - if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then + if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in]) - elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then + elif test `$JAVAINTERPRETER --version 2>&1 | $GREP -c "GNU libgcj"` -gt 0; then JDK=gcj AC_MSG_RESULT([checked (gcj)]) _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` - elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then + elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in]) - elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then + elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "IBM"` -gt 0; then JDK=ibm dnl IBM JDK specific tests @@ -4887,14 +4887,14 @@ if test "$SOLAR_JAVA" != ""; then AC_MSG_ERROR([$javacompiler not found set with_jdk_home]) fi if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then - if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then + if test x`echo "$JAVACOMPILER" | $GREP -i '\.exe$'` = x; then JAVACOMPILER="${JAVACOMPILER}.exe" fi JAVACOMPILER=`cygpath -d "$JAVACOMPILER"` JAVACOMPILER=`cygpath -u "$JAVACOMPILER"` fi - if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then + if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Eclipse Java Compiler"` -gt 0; then AC_MSG_CHECKING([re-checking JDK]) JDK=gcj AC_MSG_RESULT([checked (ecj)]) @@ -4909,7 +4909,7 @@ dnl =================================================================== dnl Checks that javac is gcj dnl =================================================================== if test "$SOLAR_JAVA" != ""; then - if test `$JAVACOMPILER --version 2>&1 | grep -c "GCC"` -gt 0; then + if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then JAVACISGCJ="yes" fi fi @@ -4920,7 +4920,7 @@ dnl =================================================================== dnl Checks that javac is kaffe dnl =================================================================== if test "$SOLAR_JAVA" != ""; then - if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then + if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then JAVACISKAFFE="yes" fi fi @@ -4945,7 +4945,7 @@ if test "$SOLAR_JAVA" != ""; then AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home]) fi if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then - if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then + if test x`echo "$JAVADOC" | $GREP -i '\.exe$'` = x; then JAVADOC="${JAVADOC}.exe" fi JAVADOC=`cygpath -d "$JAVADOC"` @@ -5610,7 +5610,7 @@ msi - Windows .msi AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) - if echo "$PKGFORMAT" | grep -q rpm; then + if echo "$PKGFORMAT" | $GREP -q rpm; then _pt="rpm" AC_MSG_WARN([the rpms will need to be installed with --nodeps]) echo "the rpms will need to be installed with --nodeps" >> warn @@ -8189,7 +8189,7 @@ dnl =================================================================== dnl Zip must be a specific type for different build types. dnl =================================================================== if test $build_os = cygwin; then - if test -n "`$ZIP -h | grep -i WinNT`"; then + if test -n "`$ZIP -h | $GREP -i WinNT`"; then AC_MSG_ERROR([$ZIP is not the required Cygwin version of Info-ZIP's zip.exe.]) fi fi @@ -9761,7 +9761,7 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then XINERAMA_LINK=dynamic elif test -e "$XINERAMALIB/libXinerama.a"; then # static version - if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then + if echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then USE_XINERAMA=YES XINERAMA_LINK=static else @@ -10423,8 +10423,8 @@ if test "$SOLAR_JAVA" != "" -a "$with_junit" != "no"; then if test $? -eq 0; then # check if either class-path entry is available for hamcrest or # it's bundled - if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \ - "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then + if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \ + "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP -q 'Class-Path: hamcrest'; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please |