diff options
Diffstat (limited to 'src/auto')
-rwxr-xr-x | src/auto/configure | 69 |
1 files changed, 68 insertions, 1 deletions
diff --git a/src/auto/configure b/src/auto/configure index e8b9a5d918..644d4efe82 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -2781,7 +2781,10 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` + gccversion=`"$CC" -dumpversion` + if test "x$gccversion" = "x"; then + gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` + fi if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` @@ -9133,6 +9136,70 @@ fi done + + if test $ac_cv_header_Xm_XpmP_h = yes; then + echo "$as_me:$LINENO: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 +echo $ECHO_N "checking for XpmAttributes_21 in Xm/XpmP.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <Xm/XpmP.h> +int +main () +{ +XpmAttributes_21 attr; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF +#define XPMATTRIBUTES_TYPE XpmAttributes_21 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; cat >>confdefs.h <<\_ACEOF +#define XPMATTRIBUTES_TYPE XpmAttributes +_ACEOF + + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + else + cat >>confdefs.h <<\_ACEOF +#define XPMATTRIBUTES_TYPE XpmAttributes_21 +_ACEOF + + fi CPPFLAGS=$cppflags_save fi |