Fix for the compiler checks. The compiler flags like SUNCC and SUNCXX were
only being set when language being tested matched the current language, so C++ flags weren't being set since we changed the default language back to C. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
parent
b71ff4d35d
commit
323d1f295f
112
configure
vendored
112
configure
vendored
@ -13001,17 +13001,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6
|
||||
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
|
||||
:; INTELCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
|
||||
:; INTELCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
if test "x$GCC" != "xyes"; then
|
||||
@ -13440,17 +13440,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6
|
||||
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
|
||||
:; SGICC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
|
||||
:; SGICC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -13523,17 +13523,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6
|
||||
if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
|
||||
:; HPCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
|
||||
:; HPCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -13606,17 +13606,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6
|
||||
if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
|
||||
:; COMPAQCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
|
||||
:; COMPAQCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -13689,17 +13689,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6
|
||||
if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
|
||||
:; SUNCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
|
||||
:; SUNCC=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -14431,17 +14431,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6
|
||||
if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
|
||||
:; INTELCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
|
||||
:; INTELCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
if test "x$GCXX" != "xyes"; then
|
||||
@ -14870,17 +14870,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6
|
||||
if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
|
||||
:; SGICXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
|
||||
:; SGICXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -14953,17 +14953,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6
|
||||
if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
|
||||
:; HPCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then
|
||||
:; HPCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -15036,17 +15036,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6
|
||||
if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
|
||||
:; COMPAQCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then
|
||||
:; COMPAQCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -15119,17 +15119,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6
|
||||
if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
|
||||
:; SUNCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
if test "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then
|
||||
:; SUNCXX=yes
|
||||
else
|
||||
:;
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
@ -29762,7 +29762,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
@ -29789,7 +29789,7 @@ else
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Xlib.h"; then
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
@ -29803,18 +29803,18 @@ if test "$ac_x_libraries" = no; then
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lX11 $LIBS"
|
||||
LIBS="-lXt $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XrmInitialize ()
|
||||
XtMalloc (0)
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@ -29852,7 +29852,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libX11.$ac_extension; then
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user