Skip to content

Commit 829752f

Browse files
committed
ICU-23190 Update configure files from configure.ac using autoreconf.
1 parent 42a1d88 commit 829752f

File tree

1 file changed

+0
-153
lines changed

1 file changed

+0
-153
lines changed

icu4c/source/configure

Lines changed: 0 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,6 @@ U_HAVE_TZNAME
686686
U_TZSET
687687
U_HAVE_TZSET
688688
U_HAVE_POPEN
689-
U_HAVE_PLACEMENT_NEW
690-
U_OVERRIDE_CXX_ALLOCATION
691689
U_NL_LANGINFO_CODESET
692690
U_HAVE_NL_LANGINFO_CODESET
693691
U_IS_BIG_ENDIAN
@@ -2111,54 +2109,6 @@ printf "%s\n" "$ac_res" >&6; }
21112109
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
21122110

21132111
} # ac_fn_c_check_func
2114-
2115-
# ac_fn_cxx_try_link LINENO
2116-
# -------------------------
2117-
# Try to link conftest.$ac_ext, and return whether this succeeded.
2118-
ac_fn_cxx_try_link ()
2119-
{
2120-
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2121-
rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
2122-
if { { ac_try="$ac_link"
2123-
case "(($ac_try" in
2124-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2125-
*) ac_try_echo=$ac_try;;
2126-
esac
2127-
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2128-
printf "%s\n" "$ac_try_echo"; } >&5
2129-
(eval "$ac_link") 2>conftest.err
2130-
ac_status=$?
2131-
if test -s conftest.err; then
2132-
grep -v '^ *+' conftest.err >conftest.er1
2133-
cat conftest.er1 >&5
2134-
mv -f conftest.er1 conftest.err
2135-
fi
2136-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2137-
test $ac_status = 0; } && {
2138-
test -z "$ac_cxx_werror_flag" ||
2139-
test ! -s conftest.err
2140-
} && test -s conftest$ac_exeext && {
2141-
test "$cross_compiling" = yes ||
2142-
test -x conftest$ac_exeext
2143-
}
2144-
then :
2145-
ac_retval=0
2146-
else case e in #(
2147-
e) printf "%s\n" "$as_me: failed program was:" >&5
2148-
sed 's/^/| /' conftest.$ac_ext >&5
2149-
2150-
ac_retval=1 ;;
2151-
esac
2152-
fi
2153-
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2154-
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2155-
# interfere with the next link command; also delete a directory that is
2156-
# left behind by Apple's compiler. We do this before executing the actions.
2157-
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2158-
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2159-
as_fn_set_status $ac_retval
2160-
2161-
} # ac_fn_cxx_try_link
21622112
ac_configure_args_raw=
21632113
for ac_arg
21642114
do
@@ -7415,109 +7365,6 @@ fi
74157365

74167366

74177367

7418-
ac_ext=cpp
7419-
ac_cpp='$CXXCPP $CPPFLAGS'
7420-
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7421-
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7422-
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7423-
7424-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for properly overriding new and delete" >&5
7425-
printf %s "checking for properly overriding new and delete... " >&6; }
7426-
U_OVERRIDE_CXX_ALLOCATION=0
7427-
U_HAVE_PLACEMENT_NEW=0
7428-
if test ${ac_cv_override_cxx_allocation_ok+y}
7429-
then :
7430-
printf %s "(cached) " >&6
7431-
else case e in #(
7432-
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7433-
/* end confdefs.h. */
7434-
#include <stdlib.h>
7435-
class UMemory {
7436-
public:
7437-
void *operator new(size_t size) {return malloc(size);}
7438-
void *operator new[](size_t size) {return malloc(size);}
7439-
void operator delete(void *p) {free(p);}
7440-
void operator delete[](void *p) {free(p);}
7441-
};
7442-
7443-
int
7444-
main (void)
7445-
{
7446-
7447-
;
7448-
return 0;
7449-
}
7450-
_ACEOF
7451-
if ac_fn_cxx_try_link "$LINENO"
7452-
then :
7453-
ac_cv_override_cxx_allocation_ok=yes
7454-
else case e in #(
7455-
e) ac_cv_override_cxx_allocation_ok=no ;;
7456-
esac
7457-
fi
7458-
rm -f core conftest.err conftest.$ac_objext conftest.beam \
7459-
conftest$ac_exeext conftest.$ac_ext ;;
7460-
esac
7461-
fi
7462-
7463-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_override_cxx_allocation_ok" >&5
7464-
printf "%s\n" "$ac_cv_override_cxx_allocation_ok" >&6; }
7465-
if test $ac_cv_override_cxx_allocation_ok = yes
7466-
then
7467-
U_OVERRIDE_CXX_ALLOCATION=1
7468-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for placement new and delete" >&5
7469-
printf %s "checking for placement new and delete... " >&6; }
7470-
if test ${ac_cv_override_placement_new_ok+y}
7471-
then :
7472-
printf %s "(cached) " >&6
7473-
else case e in #(
7474-
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7475-
/* end confdefs.h. */
7476-
#include <stdlib.h>
7477-
class UMemory {
7478-
public:
7479-
void *operator new(size_t size) {return malloc(size);}
7480-
void *operator new[](size_t size) {return malloc(size);}
7481-
void operator delete(void *p) {free(p);}
7482-
void operator delete[](void *p) {free(p);}
7483-
void * operator new(size_t, void *ptr) { return ptr; }
7484-
void operator delete(void *, void *) {}
7485-
};
7486-
7487-
int
7488-
main (void)
7489-
{
7490-
7491-
;
7492-
return 0;
7493-
}
7494-
_ACEOF
7495-
if ac_fn_cxx_try_link "$LINENO"
7496-
then :
7497-
ac_cv_override_placement_new_ok=yes
7498-
else case e in #(
7499-
e) ac_cv_override_placement_new_ok=no ;;
7500-
esac
7501-
fi
7502-
rm -f core conftest.err conftest.$ac_objext conftest.beam \
7503-
conftest$ac_exeext conftest.$ac_ext ;;
7504-
esac
7505-
fi
7506-
7507-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_override_placement_new_ok" >&5
7508-
printf "%s\n" "$ac_cv_override_placement_new_ok" >&6; }
7509-
if test $ac_cv_override_placement_new_ok = yes
7510-
then
7511-
U_HAVE_PLACEMENT_NEW=1
7512-
else
7513-
CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_PLACEMENT_NEW=0"
7514-
fi
7515-
else
7516-
CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_OVERRIDE_CXX_ALLOCATION=0"
7517-
fi
7518-
7519-
7520-
75217368
ac_ext=c
75227369
ac_cpp='$CPP $CPPFLAGS'
75237370
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

0 commit comments

Comments
 (0)