[patch] Make configure script cross-build friendly

povray-config-cross.patch (text/plain), 2.68 KB, created by Tee KOBAYASHI on 2021-08-25 14:48:56 UTC

--- povray-3.7.0.0/unix/config/ax_check_lib.m4.orig
+++ povray-3.7.0.0/unix/config/ax_check_lib.m4
@@ -62,7 +62,10 @@
               ax_check_lib="unknown"
               AC_MSG_RESULT([$ax_check_lib])
             ],
-            [AC_MSG_RESULT([cross-compiling, forced])]
+            [
+              ax_check_lib="ok"
+              AC_MSG_RESULT([cross-compiling, forced])
+            ]
           )  # AC_RUN_IFELSE
         ],
         [ax_check_lib="no headers"]
--- povray-3.7.0.0/unix/config/ax_test_compiler_flags.m4.orig
+++ povray-3.7.0.0/unix/config/ax_test_compiler_flags.m4
@@ -72,19 +72,14 @@
 
       eval "$ax_test_compiler_flags_var=no"
       if test "$ax_test_compiler_flags_err" = x"" || test x"$ax_test_compiler_flags_diff" = x""; then
-        # compile, link, and run the test program.
+        # compile and link the test program.
         echo "$ax_test_compiler $_AC_LANG_PREFIX[]FLAGS $1 conftest.$ac_ext -o conftest$ac_exeext 2> conftest.err" >&AS_MESSAGE_LOG_FD
               $ax_test_compiler $_AC_LANG_PREFIX[]FLAGS $1 conftest.$ac_ext -o conftest$ac_exeext 2> conftest.err  >&AS_MESSAGE_LOG_FD
         echo "cat conftest.err" >&AS_MESSAGE_LOG_FD
               cat conftest.err  >&AS_MESSAGE_LOG_FD
-        echo "./conftest$ac_exeext 2> conftest.err >&2" >&AS_MESSAGE_LOG_FD
-              ./conftest$ac_exeext 2> conftest.err >&2
-        ax_test_compiler_flags_run=$?
-        echo "cat conftest.err" >&AS_MESSAGE_LOG_FD
-              cat conftest.err  >&AS_MESSAGE_LOG_FD
 
         # success
-        if test x"`cat conftest.err`" = x"" && test x"$ax_test_compiler_flags_run" = x"0"; then
+        if test x"`cat conftest.err`" = x""; then
           eval "$ax_test_compiler_flags_var=yes"
         fi
       fi
--- povray-3.7.0.0/unix/config/ax_check_libjpeg.m4.orig
+++ povray-3.7.0.0/unix/config/ax_check_libjpeg.m4
@@ -66,7 +66,10 @@
               ax_check_libjpeg="unknown"
               AC_MSG_RESULT([$ax_check_libjpeg])
             ],
-            [AC_MSG_RESULT([cross-compiling, forced])]
+            [
+              ax_check_libjpeg="ok"
+              AC_MSG_RESULT([cross-compiling, forced])
+            ]
           )  # AC_RUN_IFELSE
         ],
         [ax_check_libjpeg="no headers"]
--- povray-3.7.0.0/unix/config/ax_check_libtiff.m4.orig
+++ povray-3.7.0.0/unix/config/ax_check_libtiff.m4
@@ -70,7 +70,10 @@
               ax_check_libtiff="unknown"
               AC_MSG_RESULT([$ax_check_libtiff])
             ],
-            [AC_MSG_RESULT([cross-compiling, forced])]
+            [
+              ax_check_libtiff="ok"
+              AC_MSG_RESULT([cross-compiling, forced])
+            ]
           )  # AC_RUN_IFELSE
         ],
         [ax_check_libtiff="no headers"]