@@ -4322,7 +4322,7 @@ else
4322
4322
ac_save_c_werror_flag=$ac_c_werror_flag
4323
4323
ac_c_werror_flag=yes
4324
4324
ac_cv_prog_cc_g=no
4325
- CFLAGS="-g "
4325
+ CFLAGS="-g2 "
4326
4326
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4327
4327
/* end confdefs.h. */
4328
4328
@@ -4353,7 +4353,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
4353
4353
4354
4354
else
4355
4355
ac_c_werror_flag=$ac_save_c_werror_flag
4356
- CFLAGS="-g "
4356
+ CFLAGS="-g2 "
4357
4357
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4358
4358
/* end confdefs.h. */
4359
4359
@@ -4381,13 +4381,13 @@ if test "$ac_test_CFLAGS" = set; then
4381
4381
CFLAGS=$ac_save_CFLAGS
4382
4382
elif test $ac_cv_prog_cc_g = yes; then
4383
4383
if test "$GCC" = yes; then
4384
- CFLAGS="-g -O2 "
4384
+ CFLAGS="-g2 -Os "
4385
4385
else
4386
- CFLAGS="-g "
4386
+ CFLAGS="-g2 "
4387
4387
fi
4388
4388
else
4389
4389
if test "$GCC" = yes; then
4390
- CFLAGS="-O2 "
4390
+ CFLAGS="-Os "
4391
4391
else
4392
4392
CFLAGS=
4393
4393
fi
@@ -4853,7 +4853,7 @@ else
4853
4853
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
4854
4854
ac_cxx_werror_flag=yes
4855
4855
ac_cv_prog_cxx_g=no
4856
- CXXFLAGS="-g "
4856
+ CXXFLAGS="-g2 "
4857
4857
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4858
4858
/* end confdefs.h. */
4859
4859
@@ -4884,7 +4884,7 @@ if ac_fn_cxx_try_compile "$LINENO"; then :
4884
4884
4885
4885
else
4886
4886
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4887
- CXXFLAGS="-g "
4887
+ CXXFLAGS="-g2 "
4888
4888
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4889
4889
/* end confdefs.h. */
4890
4890
@@ -4912,13 +4912,13 @@ if test "$ac_test_CXXFLAGS" = set; then
4912
4912
CXXFLAGS=$ac_save_CXXFLAGS
4913
4913
elif test $ac_cv_prog_cxx_g = yes; then
4914
4914
if test "$GXX" = yes; then
4915
- CXXFLAGS="-g -O2 "
4915
+ CXXFLAGS="-g2 -Os "
4916
4916
else
4917
- CXXFLAGS="-g "
4917
+ CXXFLAGS="-g2 "
4918
4918
fi
4919
4919
else
4920
4920
if test "$GXX" = yes; then
4921
- CXXFLAGS="-O2 "
4921
+ CXXFLAGS="-Os "
4922
4922
else
4923
4923
CXXFLAGS=
4924
4924
fi
@@ -5278,11 +5278,11 @@ elif test "${CFLAGS+set}" = set; then
5278
5278
elif test "$enable_coverage" = yes; then
5279
5279
: # no optimization by default
5280
5280
elif test "$GCC" = yes; then
5281
- CFLAGS="-O2 "
5281
+ CFLAGS="-Os "
5282
5282
else
5283
5283
# if the user selected debug mode, don't use -O
5284
5284
if test "$enable_debug" != yes; then
5285
- CFLAGS="-O "
5285
+ CFLAGS="-Os "
5286
5286
fi
5287
5287
fi
5288
5288
@@ -5293,11 +5293,11 @@ elif test "${CXXFLAGS+set}" = set; then
5293
5293
elif test "$enable_coverage" = yes; then
5294
5294
: # no optimization by default
5295
5295
elif test "$GCC" = yes; then
5296
- CXXFLAGS="-O2 "
5296
+ CXXFLAGS="-Os "
5297
5297
else
5298
5298
# if the user selected debug mode, don't use -O
5299
5299
if test "$enable_debug" != yes; then
5300
- CXXFLAGS="-O "
5300
+ CXXFLAGS="-Os "
5301
5301
fi
5302
5302
fi
5303
5303
@@ -5310,12 +5310,12 @@ fi
5310
5310
if test "$ac_env_BITCODE_CFLAGS_set" = set; then
5311
5311
BITCODE_CFLAGS=$ac_env_BITCODE_CFLAGS_value
5312
5312
else
5313
- BITCODE_CFLAGS="-O2 $BITCODE_CFLAGS"
5313
+ BITCODE_CFLAGS="-Os $BITCODE_CFLAGS"
5314
5314
fi
5315
5315
if test "$ac_env_BITCODE_CXXFLAGS_set" = set; then
5316
5316
BITCODE_CXXFLAGS=$ac_env_BITCODE_CXXFLAGS_value
5317
5317
else
5318
- BITCODE_CXXFLAGS="-O2 $BITCODE_CXXFLAGS"
5318
+ BITCODE_CXXFLAGS="-Os $BITCODE_CXXFLAGS"
5319
5319
fi
5320
5320
5321
5321
# C[XX]FLAGS we determined above will be added back at the end
@@ -7826,11 +7826,11 @@ fi
7826
7826
7827
7827
# supply -g if --enable-debug
7828
7828
if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
7829
- CFLAGS="$CFLAGS -g "
7829
+ CFLAGS="$CFLAGS -g2 "
7830
7830
fi
7831
7831
7832
7832
if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then
7833
- CXXFLAGS="$CXXFLAGS -g "
7833
+ CXXFLAGS="$CXXFLAGS -g2 "
7834
7834
fi
7835
7835
7836
7836
# enable code coverage if --enable-coverage
@@ -13588,7 +13588,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13588
13588
#ifdef __cplusplus
13589
13589
extern "C"
13590
13590
#endif
13591
- char uuid_export ();
13591
+ extern char uuid_export ();
13592
13592
int
13593
13593
main ()
13594
13594
{
@@ -13650,7 +13650,7 @@ $as_echo "$ac_cv_lib_uuid_uuid_export" >&6; }
13650
13650
if test "x$ac_cv_lib_uuid_uuid_export" = xyes; then :
13651
13651
UUID_LIBS="-luuid"
13652
13652
else
13653
- as_fn_error $? "library 'ossp-uuid' or 'uuid' is required for OSSP UUID" "$LINENO" 5
13653
+ ac_cv_lib_ossp_uuid_uuid_export=yes
13654
13654
fi
13655
13655
13656
13656
fi
0 commit comments