Enable fat build by default.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac52ee381a8659d3d43ecb9d8d4649aa50fe348e..57bbc04fdeb180c73880032f10614732ce273f70 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build/x86-64:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - ./.bootstrap &&
-    ./configure --disable-static --enable-fat --disable-documentation && make -j4 &&
+    ./configure --disable-static --disable-documentation && make -j4 &&
     make check -j4 &&
     make check-fat
   tags:
@@ -26,7 +26,7 @@ build/mini-gmp:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
   script:
   - ./.bootstrap &&
-    ./configure --disable-documentation --enable-mini-gmp && make -j4 &&
+    ./configure --disable-documentation --disable-fat --enable-mini-gmp && make -j4 &&
     make check -j4
   tags:
   - shared
@@ -128,7 +128,7 @@ Debian.cross.x86:
   - export CC_FOR_BUILD="gcc"
   - export CC="$host-gcc"
   - ./.bootstrap &&
-    CFLAGS="-O2 -g" ./configure --build=$build --host=$host --enable-fat --disable-documentation && make -j4 &&
+    CFLAGS="-O2 -g" ./configure --build=$build --host=$host --disable-documentation && make -j4 &&
     make check -j4
   tags:
   - shared
@@ -154,7 +154,7 @@ Debian.cross.x86:
   - export CC_FOR_BUILD="gcc"
   - export CC="$host-gcc"
   - ./.bootstrap
-  - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host
+  - ./configure --disable-static --disable-documentation --build=$build --host=$host
   - make -j$(nproc)
   - make -j$(nproc) check
   - make -j$(nproc) check-fat

diff --git a/ChangeLog b/ChangeLog
index 2c70f3872a400967a74433387d8f74aee41a2f86..6ad199a1529fa8a5d4aaac06f1640e33c6b5ac5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-27  Niels Möller  <nisse@lysator.liu.se>
+
+       * configure.ac: Enable fat build by default.
+
 2020-12-26  Niels Möller  <nisse@lysator.liu.se>
 
        * NEWS: News entries for Nettle-3.7.

diff --git a/configure.ac b/configure.ac
index fbb05e1993f5573b7a87f16d9ebe10e01ae3466e..763df3b589804f3b435c8413988aaf3ac2ab623b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,8 @@ AC_ARG_ENABLE(documentation,
   AC_HELP_STRING([--disable-documentation], [Omit building and installing the documentation. (default=auto)]),,
   [enable_documentation=auto])
 
-AC_ARG_ENABLE(fat, AC_HELP_STRING([--enable-fat], [Enable fat library build (default=no)]),,
-  [enable_fat=no])
+AC_ARG_ENABLE(fat, AC_HELP_STRING([--disable-fat], [Disable fat library build]),,
+  [enable_fat=yes])
 
 AC_ARG_ENABLE(arm-neon,
   AC_HELP_STRING([--enable-arm-neon], [Enable ARM Neon assembly. (default=auto)]),,