Properly fix default-target setting code.

diff --git a/dist/make-native-files b/dist/make-native-files
index 9e9b263768ad185ac968a9f4818371077322a579..ccd647ec6f295e06da221209cf68d226152dcbf9 100755 (executable)
--- a/dist/make-native-files
+++ b/dist/make-native-files
@@ -47,9 +47,9 @@ shift 2
 build ()
 {
     my_configure --enable-native-code="${ARCH}" \
-       --with-mcrypt=no --with-libpq=no --with-db-4=no \
-       --with-default-target=compile-microcode
-    my_make all
+       --with-mcrypt=no --with-libpq=no --with-db-4=no
+    my_make
+    touch .native-release-marker
 }
 
 OUT_ROOT=${NATIVE_OUT}-${ARCH}

diff --git a/src/configure.ac b/src/configure.ac
index 4c0263e0c4b3248caa8fc0791ba00ecfbfaa9cad..3c794692f9943f5afca238e4ea510e604af587cb 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 ])
 
+if test -f .native-release-marker; then
+    IS_NATIVE_RELEASE=yes
+else
+    IS_NATIVE_RELEASE=no
+fi
+
 AC_ARG_ENABLE([debugging],
     AS_HELP_STRING([--enable-debugging],
        [Compile with debugging support [[no]]]))
@@ -42,16 +48,21 @@ AC_ARG_ENABLE([native-code],
 AC_ARG_ENABLE([host-scheme-test],
     AS_HELP_STRING([--enable-host-scheme-test],
        [Test for working scheme on build host [[if necessary]]]))
-if test -f lib/all.com; then
-  : ${enable_host_scheme_test=no}
+if test x"${IS_NATIVE_RELEASE}" = xyes || test -f lib/all.com; then
+    : ${enable_host_scheme_test=no}
 else
-  : ${enable_host_scheme_test=yes}
+    : ${enable_host_scheme_test=yes}
 fi
 
 AC_ARG_WITH([default-target],
     AS_HELP_STRING([--with-default-target],
        [Set the default make target [[all]]]))
-DEFAULT_TARGET=${with_default_target=all}
+if test x"${IS_NATIVE_RELEASE}" = xyes; then
+    : ${with_default_target=compile-microcode}
+else
+    : ${with_default_target=all}
+fi
+DEFAULT_TARGET=${with_default_target}
 
 AC_CANONICAL_HOST