1 diff -urN povray-3.6.1.org/acinclude.m4 povray-3.6.1/acinclude.m4
2 --- povray-3.6.1.org/acinclude.m4 2004-08-03 01:16:14.000000000 +0200
3 +++ povray-3.6.1/acinclude.m4 2007-01-27 22:37:25.000000000 +0100
6 # check for -dumpversion
7 AC_TRY_COMMAND([$CXX -dumpversion < /dev/null 2> /dev/null > conftest.out])
8 - pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep '[[0-9]]'`
9 + pov_prog_cxx_version=$(cat conftest.out | egrep '[[0-9]]')
12 if test -z "$pov_prog_cxx_version"; then
13 AC_TRY_COMMAND([$CXX -v < /dev/null 2>&1 | tr A-Z a-z > conftest.out])
14 - pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
15 + pov_prog_cxx_version=$(cat conftest.out | egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,')
18 # final compiler version string
20 AC_REQUIRE([AC_PROG_EGREP])
22 # Create a unique cache-id name (multiple flags are handled).
23 - pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo $1 | sed 's,[[^a-zA-Z0-9]],_,g'`
24 + pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags$(echo $1 | sed 's,[[^a-zA-Z0-9]],_,g')
26 # Create the extended regular expression to handle multiple flags.
27 # For instance, "-first-flag -second-flag -X" gives the regexp:
29 # FreeBSD and Darwin seem to have a problem with the \+ sed construct
30 # (but apparently not with the \{x,y\} one). For safety, I prefer to
31 # use [[:space:]][[:space:]]* for [[:space:]]\+
32 - pov_prog_cxx_flags_regexp=`echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
33 + pov_prog_cxx_flags_regexp=$(echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,')
35 # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
36 AC_MSG_CHECKING([whether $CXX accepts $1])
38 AC_TRY_COMMAND([$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0])
39 AC_TRY_COMMAND([$CXX -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
40 AC_TRY_COMMAND([cat conftest.err >&5])
41 - AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
42 + AC_TRY_COMMAND([egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
43 # the command above seems to not always return the correct status, so
44 # for safety I rerun it here; I keep the other one for logging purpose.
45 - pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
46 + pov_prog_cxx_flags_err=$(egrep "$pov_prog_cxx_flags_regexp" conftest.err)
47 AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
48 if test -z "$pov_prog_cxx_flags_err" \
49 || test -z "`diff conftest.err0 conftest.err`"; then
52 AC_REQUIRE([AC_PROG_EGREP])
54 - pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo $1 | sed 's,[[^a-zA-Z0-9]],_,g'`
55 - pov_prog_cc_flags_regexp=`echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
56 + pov_prog_cc_flags_var=pov_cv_prog_cc_flags$(echo $1 | sed 's,[[^a-zA-Z0-9]],_,g')
57 + pov_prog_cc_flags_regexp=$(echo $1 | sed 's,\(-.\)\([[^[:space:]]]*\),\\\\\1|\2,g; s,[[[:space:]]][[[:space:]]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,')
59 AC_MSG_CHECKING([whether $CC accepts $1])
62 AC_TRY_COMMAND([$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0])
63 AC_TRY_COMMAND([$CC -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
64 AC_TRY_COMMAND([cat conftest.err >&5])
65 - AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
66 - pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
67 + AC_TRY_COMMAND([egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
68 + pov_prog_cc_flags_err=$(egrep "$pov_prog_cc_flags_regexp" conftest.err)
69 AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
70 if test -z "$pov_prog_cc_flags_err" \
71 || test -z "`diff conftest.err0 conftest.err`"; then