Commit c7fe2a94905409192d60834441df436f598ebd9b
1 parent
7c1e0a2a
Regenerate autofiles
Showing
2 changed files
with
64 additions
and
1 deletions
autofiles.sums
| 1 | -8e191dc63d2709fcd089ff62dd022589d12892129616a6036fa7e39833dd5443 configure.ac | 1 | +13072ffa0c9c48efda03b39e9f372f17e904817327f022d06ec6b66b8b2ed6b8 configure.ac |
| 2 | 35bc5c645dc42d47f2daeea06f8f3e767c8a1aee6a35eb2b4854fd2ce66c3413 m4/ax_random_device.m4 | 2 | 35bc5c645dc42d47f2daeea06f8f3e767c8a1aee6a35eb2b4854fd2ce66c3413 m4/ax_random_device.m4 |
| 3 | 37f8897d5f68d7d484e5457832a8f190ddb7507fa2a467cb7ee2be40a4364643 m4/libtool.m4 | 3 | 37f8897d5f68d7d484e5457832a8f190ddb7507fa2a467cb7ee2be40a4364643 m4/libtool.m4 |
| 4 | e77ebba8361b36f14b4d0927173a034b98c5d05049697a9ded84d85eb99a7990 m4/ltoptions.m4 | 4 | e77ebba8361b36f14b4d0927173a034b98c5d05049697a9ded84d85eb99a7990 m4/ltoptions.m4 |
configure
| @@ -647,6 +647,8 @@ BUILDRULES | @@ -647,6 +647,8 @@ BUILDRULES | ||
| 647 | GENDEPS | 647 | GENDEPS |
| 648 | HAVE_LD_VERSION_SCRIPT | 648 | HAVE_LD_VERSION_SCRIPT |
| 649 | QPDF_LARGE_FILE_TEST_PATH | 649 | QPDF_LARGE_FILE_TEST_PATH |
| 650 | +WINDOWS_WMAIN_LINK | ||
| 651 | +WINDOWS_WMAIN_COMPILE | ||
| 650 | WINDOWS_WORDSIZE | 652 | WINDOWS_WORDSIZE |
| 651 | RANDOM_DEVICE | 653 | RANDOM_DEVICE |
| 652 | LT_SONAME | 654 | LT_SONAME |
| @@ -15983,6 +15985,67 @@ fi | @@ -15983,6 +15985,67 @@ fi | ||
| 15983 | 15985 | ||
| 15984 | fi | 15986 | fi |
| 15985 | 15987 | ||
| 15988 | +qpdf_USE_WMAIN=0 | ||
| 15989 | +ac_ext=cpp | ||
| 15990 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
| 15991 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
| 15992 | +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
| 15993 | +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
| 15994 | + | ||
| 15995 | + | ||
| 15996 | + | ||
| 15997 | +for i in 0 1; do | ||
| 15998 | + if test "$qpdf_USE_WMAIN" = "0"; then | ||
| 15999 | + oLDFLAGS="$LDFLAGS" | ||
| 16000 | + if test "$i" = "1"; then | ||
| 16001 | + nLDFLAGS="-municode" | ||
| 16002 | + LDFLAGS="$LDFLAGS $nLDFLAGS" | ||
| 16003 | + msg="checking for wmain with $nLDFLAGS" | ||
| 16004 | + else | ||
| 16005 | + nLDFLAGS= | ||
| 16006 | + msg="checking for wmain" | ||
| 16007 | + fi | ||
| 16008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 | ||
| 16009 | +$as_echo_n "checking $msg... " >&6; } | ||
| 16010 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 16011 | +/* end confdefs.h. */ | ||
| 16012 | +#include <windows.h> | ||
| 16013 | + #include <string.h> | ||
| 16014 | + #include <stdio.h> | ||
| 16015 | + extern "C" | ||
| 16016 | + int wmain(int argc, wchar_t* argv[]) | ||
| 16017 | + { | ||
| 16018 | + size_t x = wcslen(argv[0]); | ||
| 16019 | + return 0; | ||
| 16020 | + } | ||
| 16021 | + | ||
| 16022 | +_ACEOF | ||
| 16023 | +if ac_fn_cxx_try_link "$LINENO"; then : | ||
| 16024 | + qpdf_USE_WMAIN=1 | ||
| 16025 | +else | ||
| 16026 | + qpdf_USE_WMAIN=0 | ||
| 16027 | +fi | ||
| 16028 | +rm -f core conftest.err conftest.$ac_objext \ | ||
| 16029 | + conftest$ac_exeext conftest.$ac_ext | ||
| 16030 | + LDFLAGS="$oLDFLAGS" | ||
| 16031 | + if test "$qpdf_USE_WMAIN" = "1"; then | ||
| 16032 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
| 16033 | +$as_echo "yes" >&6; } | ||
| 16034 | + WINDOWS_WMAIN_COMPILE="-DWINDOWS_WMAIN $nLDFLAGS" | ||
| 16035 | + WINDOWS_WMAIN_LINK="$nLDFLAGS" | ||
| 16036 | + else | ||
| 16037 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
| 16038 | +$as_echo "no" >&6; } | ||
| 16039 | + fi | ||
| 16040 | + fi | ||
| 16041 | +done | ||
| 16042 | +ac_ext=c | ||
| 16043 | +ac_cpp='$CPP $CPPFLAGS' | ||
| 16044 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
| 16045 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
| 16046 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
| 16047 | + | ||
| 16048 | + | ||
| 15986 | if test "x$qpdf_OS_SECURE_RANDOM" = "x1"; then | 16049 | if test "x$qpdf_OS_SECURE_RANDOM" = "x1"; then |
| 15987 | OLIBS=$LIBS | 16050 | OLIBS=$LIBS |
| 15988 | LIBS="$LIBS Advapi32.lib" | 16051 | LIBS="$LIBS Advapi32.lib" |