@@ -701,6 +701,9 @@ with_zstd
701
701
LZ4_LIBS
702
702
LZ4_CFLAGS
703
703
with_lz4
704
+ SIMDSORT_LIBS
705
+ SIMDSORT_CFLAGS
706
+ with_simdsort
704
707
with_zlib
705
708
with_system_tzdata
706
709
with_libxslt
@@ -809,6 +812,7 @@ infodir
809
812
docdir
810
813
oldincludedir
811
814
includedir
815
+ runstatedir
812
816
localstatedir
813
817
sharedstatedir
814
818
sysconfdir
@@ -876,6 +880,7 @@ with_libxml
876
880
with_libxslt
877
881
with_system_tzdata
878
882
with_zlib
883
+ with_simdsort
879
884
with_lz4
880
885
with_zstd
881
886
with_ssl
@@ -909,6 +914,8 @@ LIBCURL_LIBS
909
914
XML2_CONFIG
910
915
XML2_CFLAGS
911
916
XML2_LIBS
917
+ SIMDSORT_CFLAGS
918
+ SIMDSORT_LIBS
912
919
LZ4_CFLAGS
913
920
LZ4_LIBS
914
921
ZSTD_CFLAGS
@@ -957,6 +964,7 @@ datadir='${datarootdir}'
957
964
sysconfdir='${prefix}/etc'
958
965
sharedstatedir='${prefix}/com'
959
966
localstatedir='${prefix}/var'
967
+ runstatedir='${localstatedir}/run'
960
968
includedir='${prefix}/include'
961
969
oldincludedir='/usr/include'
962
970
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1209,6 +1217,15 @@ do
1209
1217
| -silent | --silent | --silen | --sile | --sil)
1210
1218
silent=yes ;;
1211
1219
1220
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
1221
+ | --runstate | --runstat | --runsta | --runst | --runs \
1222
+ | --run | --ru | --r)
1223
+ ac_prev=runstatedir ;;
1224
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1225
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1226
+ | --run=* | --ru=* | --r=*)
1227
+ runstatedir=$ac_optarg ;;
1228
+
1212
1229
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1213
1230
ac_prev=sbindir ;;
1214
1231
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
1346
1363
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1347
1364
datadir sysconfdir sharedstatedir localstatedir includedir \
1348
1365
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1349
- libdir localedir mandir
1366
+ libdir localedir mandir runstatedir
1350
1367
do
1351
1368
eval ac_val=\$$ac_var
1352
1369
# Remove trailing slashes.
@@ -1499,6 +1516,7 @@ Fine tuning of the installation directories:
1499
1516
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1500
1517
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1501
1518
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1519
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1502
1520
--libdir=DIR object code libraries [EPREFIX/lib]
1503
1521
--includedir=DIR C header files [PREFIX/include]
1504
1522
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1593,6 +1611,7 @@ Optional Packages:
1593
1611
--with-system-tzdata=DIR
1594
1612
use system time zone data in DIR
1595
1613
--without-zlib do not use Zlib
1614
+ --with-simdsort build with SIMDSORT support
1596
1615
--with-lz4 build with LZ4 support
1597
1616
--with-zstd build with ZSTD support
1598
1617
--with-ssl=LIB use LIB for SSL/TLS support (openssl)
@@ -1632,6 +1651,10 @@ Some influential environment variables:
1632
1651
XML2_CONFIG path to xml2-config utility
1633
1652
XML2_CFLAGS C compiler flags for XML2, overriding pkg-config
1634
1653
XML2_LIBS linker flags for XML2, overriding pkg-config
1654
+ SIMDSORT_CFLAGS
1655
+ C compiler flags for SIMDSORT, overriding pkg-config
1656
+ SIMDSORT_LIBS
1657
+ linker flags for SIMDSORT, overriding pkg-config
1635
1658
LZ4_CFLAGS C compiler flags for LZ4, overriding pkg-config
1636
1659
LZ4_LIBS linker flags for LZ4, overriding pkg-config
1637
1660
ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config
@@ -9337,6 +9360,147 @@ fi
9337
9360
9338
9361
9339
9362
9363
+ #
9364
+ # SIMDSORT
9365
+ #
9366
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with SIMDSORT support" >&5
9367
+ $as_echo_n "checking whether to build with SIMDSORT support... " >&6; }
9368
+
9369
+
9370
+
9371
+ # Check whether --with-simdsort was given.
9372
+ if test "${with_simdsort+set}" = set; then :
9373
+ withval=$with_simdsort;
9374
+ case $withval in
9375
+ yes)
9376
+
9377
+ $as_echo "#define USE_SIMDSORT 1" >>confdefs.h
9378
+
9379
+ ;;
9380
+ no)
9381
+ :
9382
+ ;;
9383
+ *)
9384
+ as_fn_error $? "no argument expected for --with-simdsort option" "$LINENO" 5
9385
+ ;;
9386
+ esac
9387
+
9388
+ else
9389
+ with_simdsort=no
9390
+
9391
+ fi
9392
+
9393
+
9394
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_simdsort" >&5
9395
+ $as_echo "$with_simdsort" >&6; }
9396
+
9397
+
9398
+ if test "$with_simdsort" = yes; then
9399
+
9400
+ pkg_failed=no
9401
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86simdsortcpp" >&5
9402
+ $as_echo_n "checking for x86simdsortcpp... " >&6; }
9403
+
9404
+ if test -n "$SIMDSORT_CFLAGS"; then
9405
+ pkg_cv_SIMDSORT_CFLAGS="$SIMDSORT_CFLAGS"
9406
+ elif test -n "$PKG_CONFIG"; then
9407
+ if test -n "$PKG_CONFIG" && \
9408
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x86simdsortcpp\""; } >&5
9409
+ ($PKG_CONFIG --exists --print-errors "x86simdsortcpp") 2>&5
9410
+ ac_status=$?
9411
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9412
+ test $ac_status = 0; }; then
9413
+ pkg_cv_SIMDSORT_CFLAGS=`$PKG_CONFIG --cflags "x86simdsortcpp" 2>/dev/null`
9414
+ test "x$?" != "x0" && pkg_failed=yes
9415
+ else
9416
+ pkg_failed=yes
9417
+ fi
9418
+ else
9419
+ pkg_failed=untried
9420
+ fi
9421
+ if test -n "$SIMDSORT_LIBS"; then
9422
+ pkg_cv_SIMDSORT_LIBS="$SIMDSORT_LIBS"
9423
+ elif test -n "$PKG_CONFIG"; then
9424
+ if test -n "$PKG_CONFIG" && \
9425
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x86simdsortcpp\""; } >&5
9426
+ ($PKG_CONFIG --exists --print-errors "x86simdsortcpp") 2>&5
9427
+ ac_status=$?
9428
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9429
+ test $ac_status = 0; }; then
9430
+ pkg_cv_SIMDSORT_LIBS=`$PKG_CONFIG --libs "x86simdsortcpp" 2>/dev/null`
9431
+ test "x$?" != "x0" && pkg_failed=yes
9432
+ else
9433
+ pkg_failed=yes
9434
+ fi
9435
+ else
9436
+ pkg_failed=untried
9437
+ fi
9438
+
9439
+
9440
+
9441
+ if test $pkg_failed = yes; then
9442
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9443
+ $as_echo "no" >&6; }
9444
+
9445
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
9446
+ _pkg_short_errors_supported=yes
9447
+ else
9448
+ _pkg_short_errors_supported=no
9449
+ fi
9450
+ if test $_pkg_short_errors_supported = yes; then
9451
+ SIMDSORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x86simdsortcpp" 2>&1`
9452
+ else
9453
+ SIMDSORT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x86simdsortcpp" 2>&1`
9454
+ fi
9455
+ # Put the nasty error message in config.log where it belongs
9456
+ echo "$SIMDSORT_PKG_ERRORS" >&5
9457
+
9458
+ as_fn_error $? "Package requirements (x86simdsortcpp) were not met:
9459
+
9460
+ $SIMDSORT_PKG_ERRORS
9461
+
9462
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
9463
+ installed software in a non-standard prefix.
9464
+
9465
+ Alternatively, you may set the environment variables SIMDSORT_CFLAGS
9466
+ and SIMDSORT_LIBS to avoid the need to call pkg-config.
9467
+ See the pkg-config man page for more details." "$LINENO" 5
9468
+ elif test $pkg_failed = untried; then
9469
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9470
+ $as_echo "no" >&6; }
9471
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9472
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9473
+ as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
9474
+ is in your PATH or set the PKG_CONFIG environment variable to the full
9475
+ path to pkg-config.
9476
+
9477
+ Alternatively, you may set the environment variables SIMDSORT_CFLAGS
9478
+ and SIMDSORT_LIBS to avoid the need to call pkg-config.
9479
+ See the pkg-config man page for more details.
9480
+
9481
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9482
+ See \`config.log' for more details" "$LINENO" 5; }
9483
+ else
9484
+ SIMDSORT_CFLAGS=$pkg_cv_SIMDSORT_CFLAGS
9485
+ SIMDSORT_LIBS=$pkg_cv_SIMDSORT_LIBS
9486
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9487
+ $as_echo "yes" >&6; }
9488
+
9489
+ fi
9490
+ # We only care about -I, -D, and -L switches;
9491
+ # note that -lsimdsort will be added by AC_CHECK_LIB below.
9492
+ for pgac_option in $SIMDSORT_CFLAGS; do
9493
+ case $pgac_option in
9494
+ -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
9495
+ esac
9496
+ done
9497
+ for pgac_option in $SIMDSORT_LIBS; do
9498
+ case $pgac_option in
9499
+ -L*) LDFLAGS="$LDFLAGS $pgac_option";;
9500
+ esac
9501
+ done
9502
+ fi
9503
+
9340
9504
#
9341
9505
# LZ4
9342
9506
#
@@ -13101,6 +13265,56 @@ fi
13101
13265
13102
13266
fi
13103
13267
13268
+ if test "$with_simdsort" = yes ; then
13269
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyvalue_qsort_float_sizet in -lx86simdsortcpp" >&5
13270
+ $as_echo_n "checking for keyvalue_qsort_float_sizet in -lx86simdsortcpp... " >&6; }
13271
+ if ${ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet+:} false; then :
13272
+ $as_echo_n "(cached) " >&6
13273
+ else
13274
+ ac_check_lib_save_LIBS=$LIBS
13275
+ LIBS="-lx86simdsortcpp $LIBS"
13276
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13277
+ /* end confdefs.h. */
13278
+
13279
+ /* Override any GCC internal prototype to avoid an error.
13280
+ Use char because int might match the return type of a GCC
13281
+ builtin and then its argument prototype would still apply. */
13282
+ #ifdef __cplusplus
13283
+ extern "C"
13284
+ #endif
13285
+ char keyvalue_qsort_float_sizet ();
13286
+ int
13287
+ main ()
13288
+ {
13289
+ return keyvalue_qsort_float_sizet ();
13290
+ ;
13291
+ return 0;
13292
+ }
13293
+ _ACEOF
13294
+ if ac_fn_c_try_link "$LINENO"; then :
13295
+ ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet=yes
13296
+ else
13297
+ ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet=no
13298
+ fi
13299
+ rm -f core conftest.err conftest.$ac_objext \
13300
+ conftest$ac_exeext conftest.$ac_ext
13301
+ LIBS=$ac_check_lib_save_LIBS
13302
+ fi
13303
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet" >&5
13304
+ $as_echo "$ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet" >&6; }
13305
+ if test "x$ac_cv_lib_x86simdsortcpp_keyvalue_qsort_float_sizet" = xyes; then :
13306
+ cat >>confdefs.h <<_ACEOF
13307
+ #define HAVE_LIBX86SIMDSORTCPP 1
13308
+ _ACEOF
13309
+
13310
+ LIBS="-lx86simdsortcpp $LIBS"
13311
+
13312
+ else
13313
+ as_fn_error $? "library 'x86simdsortcpp' is required for SIMDSORt support" "$LINENO" 5
13314
+ fi
13315
+
13316
+ fi
13317
+
13104
13318
if test "$with_lz4" = yes ; then
13105
13319
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4_compress_default in -llz4" >&5
13106
13320
$as_echo_n "checking for LZ4_compress_default in -llz4... " >&6; }
@@ -13202,6 +13416,8 @@ fi
13202
13416
fi
13203
13417
13204
13418
# Note: We can test for libldap_r only after we know PTHREAD_LIBS
13419
+ # also, on AIX, we may need to have openssl in LIBS for this step.
13420
+
13205
13421
if test "$with_ldap" = yes ; then
13206
13422
_LIBS="$LIBS"
13207
13423
if test "$PORTNAME" != "win32"; then
@@ -15133,7 +15349,7 @@ else
15133
15349
We can't simply define LARGE_OFF_T to be 9223372036854775807,
15134
15350
since some C++ compilers masquerading as C compilers
15135
15351
incorrectly reject 9223372036854775807. */
15136
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62 ))
15352
+ #define LARGE_OFF_T (((( off_t) 1 << 31) << 31) - 1 + ((( off_t) 1 << 31) << 31 ))
15137
15353
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
15138
15354
&& LARGE_OFF_T % 2147483647 == 1)
15139
15355
? 1 : -1];
@@ -15179,7 +15395,7 @@ else
15179
15395
We can't simply define LARGE_OFF_T to be 9223372036854775807,
15180
15396
since some C++ compilers masquerading as C compilers
15181
15397
incorrectly reject 9223372036854775807. */
15182
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62 ))
15398
+ #define LARGE_OFF_T (((( off_t) 1 << 31) << 31) - 1 + ((( off_t) 1 << 31) << 31 ))
15183
15399
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
15184
15400
&& LARGE_OFF_T % 2147483647 == 1)
15185
15401
? 1 : -1];
@@ -15203,7 +15419,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15203
15419
We can't simply define LARGE_OFF_T to be 9223372036854775807,
15204
15420
since some C++ compilers masquerading as C compilers
15205
15421
incorrectly reject 9223372036854775807. */
15206
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62 ))
15422
+ #define LARGE_OFF_T (((( off_t) 1 << 31) << 31) - 1 + ((( off_t) 1 << 31) << 31 ))
15207
15423
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
15208
15424
&& LARGE_OFF_T % 2147483647 == 1)
15209
15425
? 1 : -1];
@@ -15248,7 +15464,7 @@ else
15248
15464
We can't simply define LARGE_OFF_T to be 9223372036854775807,
15249
15465
since some C++ compilers masquerading as C compilers
15250
15466
incorrectly reject 9223372036854775807. */
15251
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62 ))
15467
+ #define LARGE_OFF_T (((( off_t) 1 << 31) << 31) - 1 + ((( off_t) 1 << 31) << 31 ))
15252
15468
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
15253
15469
&& LARGE_OFF_T % 2147483647 == 1)
15254
15470
? 1 : -1];
@@ -15272,7 +15488,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15272
15488
We can't simply define LARGE_OFF_T to be 9223372036854775807,
15273
15489
since some C++ compilers masquerading as C compilers
15274
15490
incorrectly reject 9223372036854775807. */
15275
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62 ))
15491
+ #define LARGE_OFF_T (((( off_t) 1 << 31) << 31) - 1 + ((( off_t) 1 << 31) << 31 ))
15276
15492
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
15277
15493
&& LARGE_OFF_T % 2147483647 == 1)
15278
15494
? 1 : -1];
0 commit comments