Skip to content

Commit 4cc2fe1

Browse files
tirantiran
committed
Allow users to set empty flags
1 parent 4aec1ea commit 4cc2fe1

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

‎configure

+31-31
Original file line numberDiff line numberDiff line change
@@ -10538,8 +10538,8 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1053810538
_ACEOF
1053910539

1054010540
have_uuid=yes
10541-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
10542-
LIBUUID_LIBS=${LIBUUID_LIBS:-""}
10541+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
10542+
LIBUUID_LIBS=${LIBUUID_LIBS-""}
1054310543

1054410544
fi
1054510545
done
@@ -10731,8 +10731,8 @@ LIBS=$save_LIBS
1073110731

1073210732
if test "x$have_uuid" = xyes; then :
1073310733

10734-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
10735-
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
10734+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
10735+
LIBUUID_LIBS=${LIBUUID_LIBS-"-luuid"}
1073610736

1073710737
fi
1073810738

@@ -10865,8 +10865,8 @@ LIBS=$save_LIBS
1086510865

1086610866
if test "x$have_uuid" = xyes; then :
1086710867

10868-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
10869-
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
10868+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
10869+
LIBUUID_LIBS=${LIBUUID_LIBS-"-luuid"}
1087010870

1087110871
fi
1087210872

@@ -10906,8 +10906,8 @@ _ACEOF
1090610906
if test "x$ac_cv_func_uuid_generate_time" = xyes; then :
1090710907

1090810908
have_uuid=yes
10909-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
10910-
LIBUUID_LIBS=${LIBUUID_LIBS:-""}
10909+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
10910+
LIBUUID_LIBS=${LIBUUID_LIBS-""}
1091110911

1091210912
fi
1091310913

@@ -11358,8 +11358,8 @@ $as_echo "$with_system_expat" >&6; }
1135811358

1135911359
if test "x$with_system_expat" = xyes; then :
1136011360

11361-
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS:-""}
11362-
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS:-"-lexpat"}
11361+
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""}
11362+
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"}
1136311363
LIBEXPAT_INTERNAL=
1136411364

1136511365
else
@@ -11432,8 +11432,8 @@ $as_echo "$with_system_libmpdec" >&6; }
1143211432

1143311433
if test "x$with_system_libmpdec" = xyes; then :
1143411434

11435-
LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS:-""}
11436-
LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS:-"-lmpdec"}
11435+
LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
11436+
LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"}
1143711437
LIBMPDEC_INTERNAL=
1143811438

1143911439
else
@@ -11608,7 +11608,7 @@ fi
1160811608
echo "$LIBNSL_PKG_ERRORS" >&5
1160911609

1161011610

11611-
LIBNSL_CFLAGS=${LIBNSL_CFLAGS:-""}
11611+
LIBNSL_CFLAGS=${LIBNSL_CFLAGS-""}
1161211612
save_CFLAGS=$CFLAGS
1161311613
save_CPPFLAGS=$CPPFLAGS
1161411614
save_LDFLAGS=$LDFLAGS
@@ -11695,7 +11695,7 @@ elif test $pkg_failed = untried; then
1169511695
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1169611696
$as_echo "no" >&6; }
1169711697

11698-
LIBNSL_CFLAGS=${LIBNSL_CFLAGS:-""}
11698+
LIBNSL_CFLAGS=${LIBNSL_CFLAGS-""}
1169911699
save_CFLAGS=$CFLAGS
1170011700
save_CPPFLAGS=$CPPFLAGS
1170111701
save_LDFLAGS=$LDFLAGS
@@ -11877,16 +11877,16 @@ fi
1187711877
echo "$LIBSQLITE3_PKG_ERRORS" >&5
1187811878

1187911879

11880-
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS:-""}
11881-
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS:-"-lsqlite3"}
11880+
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS-""}
11881+
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS-"-lsqlite3"}
1188211882

1188311883

1188411884
elif test $pkg_failed = untried; then
1188511885
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1188611886
$as_echo "no" >&6; }
1188711887

11888-
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS:-""}
11889-
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS:-"-lsqlite3"}
11888+
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS-""}
11889+
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS-"-lsqlite3"}
1189011890

1189111891

1189211892
else
@@ -12157,7 +12157,7 @@ $as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
1215712157
if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes; then :
1215812158

1215912159
have_gdbm=yes
12160-
GDBM_LIBS=${GDBM_LIBS:-"-lgdbm"}
12160+
GDBM_LIBS=${GDBM_LIBS-"-lgdbm"}
1216112161

1216212162
else
1216312163
have_gdbm=no
@@ -14629,8 +14629,8 @@ $as_echo "$ac_cv_lib_z_gzread" >&6; }
1462914629
if test "x$ac_cv_lib_z_gzread" = xyes; then :
1463014630

1463114631
have_zlib=yes
14632-
ZLIB_CFLAGS=${ZLIB_CFLAGS:-""}
14633-
ZLIB_LIBS=${ZLIB_LIBS:-"-lz"}
14632+
ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
14633+
ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
1463414634
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
1463514635
$as_echo_n "checking for inflateCopy in -lz... " >&6; }
1463614636
if ${ac_cv_lib_z_inflateCopy+:} false; then :
@@ -14751,8 +14751,8 @@ $as_echo "$ac_cv_lib_z_gzread" >&6; }
1475114751
if test "x$ac_cv_lib_z_gzread" = xyes; then :
1475214752

1475314753
have_zlib=yes
14754-
ZLIB_CFLAGS=${ZLIB_CFLAGS:-""}
14755-
ZLIB_LIBS=${ZLIB_LIBS:-"-lz"}
14754+
ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
14755+
ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
1475614756
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
1475714757
$as_echo_n "checking for inflateCopy in -lz... " >&6; }
1475814758
if ${ac_cv_lib_z_inflateCopy+:} false; then :
@@ -14948,8 +14948,8 @@ $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
1494814948
if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
1494914949

1495014950
have_bzip2=yes
14951-
BZIP2_CFLAGS=${BZIP2_CFLAGS:-""}
14952-
BZIP2_LIBS=${BZIP2_LIBS:-"-lbz2"}
14951+
BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
14952+
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
1495314953

1495414954
else
1495514955
have_bzip2=no
@@ -15027,8 +15027,8 @@ $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
1502715027
if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
1502815028

1502915029
have_bzip2=yes
15030-
BZIP2_CFLAGS=${BZIP2_CFLAGS:-""}
15031-
BZIP2_LIBS=${BZIP2_LIBS:-"-lbz2"}
15030+
BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
15031+
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
1503215032

1503315033
else
1503415034
have_bzip2=no
@@ -15170,8 +15170,8 @@ $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
1517015170
if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
1517115171

1517215172
have_liblzma=yes
15173-
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS:-""}
15174-
LIBLZMA_LIBS=${LIBLZMA_LIBS:-"-llzma"}
15173+
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
15174+
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
1517515175

1517615176
else
1517715177
have_liblzma=no
@@ -15249,8 +15249,8 @@ $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
1524915249
if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
1525015250

1525115251
have_liblzma=yes
15252-
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS:-""}
15253-
LIBLZMA_LIBS=${LIBLZMA_LIBS:-"-llzma"}
15252+
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
15253+
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
1525415254

1525515255
else
1525615256
have_liblzma=no

‎configure.ac

+20-20
Original file line numberDiff line numberDiff line change
@@ -2947,8 +2947,8 @@ dnl stream in big-endian byte-order
29472947
AC_CHECK_HEADERS([uuid.h], [
29482948
AC_CHECK_FUNCS([uuid_create uuid_enc_be], [
29492949
have_uuid=yes
2950-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
2951-
LIBUUID_LIBS=${LIBUUID_LIBS:-""}
2950+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
2951+
LIBUUID_LIBS=${LIBUUID_LIBS-""}
29522952
])
29532953
])
29542954

@@ -2972,8 +2972,8 @@ AS_VAR_IF([have_uuid], [missing], [
29722972
])
29732973
])
29742974
AS_VAR_IF([have_uuid], [yes], [
2975-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
2976-
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
2975+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
2976+
LIBUUID_LIBS=${LIBUUID_LIBS-"-luuid"}
29772977
])
29782978
])
29792979
]
@@ -2985,8 +2985,8 @@ AS_VAR_IF([have_uuid], [missing], [
29852985
AC_CHECK_HEADERS([uuid/uuid.h], [
29862986
AC_CHECK_FUNC([uuid_generate_time], [
29872987
have_uuid=yes
2988-
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
2989-
LIBUUID_LIBS=${LIBUUID_LIBS:-""}
2988+
LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
2989+
LIBUUID_LIBS=${LIBUUID_LIBS-""}
29902990
])
29912991
])
29922992
])
@@ -3149,8 +3149,8 @@ AC_ARG_WITH(system_expat,
31493149
AC_MSG_RESULT($with_system_expat)
31503150

31513151
AS_VAR_IF([with_system_expat], [yes], [
3152-
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS:-""}
3153-
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS:-"-lexpat"}
3152+
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""}
3153+
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"}
31543154
LIBEXPAT_INTERNAL=
31553155
], [
31563156
LIBEXPAT_CFLAGS="-I\$(srcdir)/Modules/expat"
@@ -3205,8 +3205,8 @@ AC_ARG_WITH(system_libmpdec,
32053205
AC_MSG_RESULT($with_system_libmpdec)
32063206

32073207
AS_VAR_IF([with_system_libmpdec], [yes], [
3208-
LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS:-""}
3209-
LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS:-"-lmpdec"}
3208+
LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
3209+
LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"}
32103210
LIBMPDEC_INTERNAL=
32113211
], [
32123212
LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
@@ -3295,7 +3295,7 @@ fi
32953295
dnl check for NIS / libnsl dependencies
32963296
dnl libnsl dependencies include tirpc includes and lib
32973297
PKG_CHECK_MODULES([LIBNSL], [libnsl], [have_nis=yes], [
3298-
LIBNSL_CFLAGS=${LIBNSL_CFLAGS:-""}
3298+
LIBNSL_CFLAGS=${LIBNSL_CFLAGS-""}
32993299
WITH_SAVE_ENV([
33003300
AC_SEARCH_LIBS([yp_match], [nsl], [have_nis=yes], [have_nis=no])
33013301
])
@@ -3317,8 +3317,8 @@ AS_VAR_IF([have_nis], [yes], [
33173317
dnl Check for SQLite library. Use pkg-config if available.
33183318
PKG_CHECK_MODULES(
33193319
[LIBSQLITE3], [sqlite3 >= 3.7.15], [], [
3320-
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS:-""}
3321-
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS:-"-lsqlite3"}
3320+
LIBSQLITE3_CFLAGS=${LIBSQLITE3_CFLAGS-""}
3321+
LIBSQLITE3_LIBS=${LIBSQLITE3_LIBS-"-lsqlite3"}
33223322
]
33233323
)
33243324
AS_VAR_APPEND([LIBSQLITE3_CFLAGS], [' -I$(srcdir)/Modules/_sqlite'])
@@ -3405,7 +3405,7 @@ WITH_SAVE_ENV([
34053405
AC_CHECK_HEADERS([gdbm.h], [
34063406
AC_CHECK_LIB([gdbm], [gdbm_open], [
34073407
have_gdbm=yes
3408-
GDBM_LIBS=${GDBM_LIBS:-"-lgdbm"}
3408+
GDBM_LIBS=${GDBM_LIBS-"-lgdbm"}
34093409
], [have_gdbm=no])
34103410
], [have_gdbm=no])
34113411
])
@@ -4199,8 +4199,8 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
41994199
WITH_SAVE_ENV([
42004200
AC_CHECK_LIB([z], [gzread], [
42014201
have_zlib=yes
4202-
ZLIB_CFLAGS=${ZLIB_CFLAGS:-""}
4203-
ZLIB_LIBS=${ZLIB_LIBS:-"-lz"}
4202+
ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
4203+
ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
42044204
AC_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
42054205
], [
42064206
have_zlib=no
@@ -4220,8 +4220,8 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
42204220
WITH_SAVE_ENV([
42214221
AC_CHECK_LIB([bz2], [BZ2_bzCompress], [
42224222
have_bzip2=yes
4223-
BZIP2_CFLAGS=${BZIP2_CFLAGS:-""}
4224-
BZIP2_LIBS=${BZIP2_LIBS:-"-lbz2"}
4223+
BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
4224+
BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
42254225
], [have_bzip2=no])
42264226
])
42274227
], [have_bzip2=no])
@@ -4232,8 +4232,8 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
42324232
WITH_SAVE_ENV([
42334233
AC_CHECK_LIB([lzma], [lzma_easy_encoder], [
42344234
have_liblzma=yes
4235-
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS:-""}
4236-
LIBLZMA_LIBS=${LIBLZMA_LIBS:-"-llzma"}
4235+
LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
4236+
LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
42374237
], [have_liblzma=no])
42384238
])
42394239
], [have_liblzma=no])

0 commit comments

Comments
 (0)