From c7fe2a94905409192d60834441df436f598ebd9b Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 13 Jan 2019 20:51:08 -0500 Subject: [PATCH] Regenerate autofiles --- autofiles.sums | 2 +- configure | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/autofiles.sums b/autofiles.sums index 21a8b47e..b9aa914c 100644 --- a/autofiles.sums +++ b/autofiles.sums @@ -1,4 +1,4 @@ -8e191dc63d2709fcd089ff62dd022589d12892129616a6036fa7e39833dd5443 configure.ac +13072ffa0c9c48efda03b39e9f372f17e904817327f022d06ec6b66b8b2ed6b8 configure.ac 35bc5c645dc42d47f2daeea06f8f3e767c8a1aee6a35eb2b4854fd2ce66c3413 m4/ax_random_device.m4 37f8897d5f68d7d484e5457832a8f190ddb7507fa2a467cb7ee2be40a4364643 m4/libtool.m4 e77ebba8361b36f14b4d0927173a034b98c5d05049697a9ded84d85eb99a7990 m4/ltoptions.m4 diff --git a/configure b/configure index 5ff3564e..a820bfbb 100755 --- a/configure +++ b/configure @@ -647,6 +647,8 @@ BUILDRULES GENDEPS HAVE_LD_VERSION_SCRIPT QPDF_LARGE_FILE_TEST_PATH +WINDOWS_WMAIN_LINK +WINDOWS_WMAIN_COMPILE WINDOWS_WORDSIZE RANDOM_DEVICE LT_SONAME @@ -15983,6 +15985,67 @@ fi fi +qpdf_USE_WMAIN=0 +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + +for i in 0 1; do + if test "$qpdf_USE_WMAIN" = "0"; then + oLDFLAGS="$LDFLAGS" + if test "$i" = "1"; then + nLDFLAGS="-municode" + LDFLAGS="$LDFLAGS $nLDFLAGS" + msg="checking for wmain with $nLDFLAGS" + else + nLDFLAGS= + msg="checking for wmain" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 +$as_echo_n "checking $msg... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + extern "C" + int wmain(int argc, wchar_t* argv[]) + { + size_t x = wcslen(argv[0]); + return 0; + } + +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + qpdf_USE_WMAIN=1 +else + qpdf_USE_WMAIN=0 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$oLDFLAGS" + if test "$qpdf_USE_WMAIN" = "1"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + WINDOWS_WMAIN_COMPILE="-DWINDOWS_WMAIN $nLDFLAGS" + WINDOWS_WMAIN_LINK="$nLDFLAGS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +done +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$qpdf_OS_SECURE_RANDOM" = "x1"; then OLIBS=$LIBS LIBS="$LIBS Advapi32.lib"