Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nV6Jr-0006cg-NA for mharc-grub-devel@gnu.org; Fri, 18 Mar 2022 02:42:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV6Jg-0006Vt-CO for grub-devel@gnu.org; Fri, 18 Mar 2022 02:42:28 -0400 Received: from [2607:f8b0:4864:20::f32] (port=46764 helo=mail-qv1-xf32.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV6Je-0004oZ-OA for grub-devel@gnu.org; Fri, 18 Mar 2022 02:42:28 -0400 Received: by mail-qv1-xf32.google.com with SMTP id j5so5853554qvs.13 for ; Thu, 17 Mar 2022 23:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W1ijwU4X04TsZG/j4NaEaJedn3DPpez01UPij5gaTus=; b=PSeYqbwsmr+EWAZDnDSBB0I4vLWIGIg78ZSjESweYYZX+SDd2w7EXhaPYqFsaPbRNQ tNLAAazy8CXkkwwoMNVte/EQkJWo7v3Qi+QfTOOTtV67wNi80ryUvktDmd/1c7oiTKBR pv14hJSHdswCyf69oIuMKZF6cdHK/+FwgPvgvakwZbOb4f+jh1Ig2YzKYbf04eUg9ze2 WntBBqbQRd69xYUHRV1OKYVcddKnveNMG2h6DAd6BK+BdpfYnWHFOpfnQFA3pcH5TxLK 0ZcZkh0lWQZ2hSQMR86XB3ky1evYomwCpgV01V7467GYgLQUtgpsrif+ztRX1FBK00F+ VImg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W1ijwU4X04TsZG/j4NaEaJedn3DPpez01UPij5gaTus=; b=m+X+FjgMTf5/CO5AfWRPO5/ZnVZdVDKAvv96cuLKIMiHzHy8jVtk/UuOya7bT+odwC 5DdNChhzb9kuFBDu1JRx62ivOO+v35LWxTaTZ3cjNGEH4P4Rf/FUPMNhLnrAXh/Nw5q2 2FK/nXy8mbVdEaEglZNdhiytw+OshiIRB491yLUO4WrPqz2CMy2gVn3qfBz4stOqyH50 koOlekUTeS3GdZN1E2e/ZhRvbkW3A5IH2e9OUbh+00mE8Iy7yxNUrlgfns1W2EeMLkjY wAzHu9UQKObtpqIWkpCbZv6v7qIQ2TWScEEndsGeum9APiKP/agnxAfnlUTwPyQca+m+ 5Jiw== X-Gm-Message-State: AOAM532UxQ76l1eOvVrUCVTxo7ONw7PzoWth3gzNQ+vzhoLLk+lxvLil jVIBEj6gvdnoOUlik+/FldXWpQ== X-Google-Smtp-Source: ABdhPJySmIxUC0b7rUBTs0XiB+NrSEYw6HXwBy28KmUFIcZCLhz3daIar2UPXrXbUXN1ZyQWkTSwzw== X-Received: by 2002:ad4:53c5:0:b0:429:d6fb:f0a0 with SMTP id k5-20020ad453c5000000b00429d6fbf0a0mr5884741qvv.108.1647585744919; Thu, 17 Mar 2022 23:42:24 -0700 (PDT) Received: from localhost.localdomain (51-15-0-88.rev.poneytelecom.eu. [51.15.0.88]) by smtp.gmail.com with ESMTPSA id y12-20020a05622a164c00b002e1e277885esm5054063qtj.8.2022.03.17.23.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 23:42:24 -0700 (PDT) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Glenn Washburn Subject: [PATCH 5/5] configure: Whitespace changes to improve readability Date: Fri, 18 Mar 2022 01:41:39 -0500 Message-Id: <28a9336ac76bdaa88ca78ded3efd9d21a860cbf4.1647585376.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f32 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f32; envelope-from=development@efficientek.com; helo=mail-qv1-xf32.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Mar 2022 06:42:28 -0000 Signed-off-by: Glenn Washburn --- configure.ac | 99 ++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 54 deletions(-) diff --git a/configure.ac b/configure.ac index 17679b641d..641cbb80df 100644 --- a/configure.ac +++ b/configure.ac @@ -112,18 +112,10 @@ case "$target_cpu" in target_cpu=mips machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPS=1" ;; - arm*) - target_cpu=arm - ;; - aarch64*) - target_cpu=arm64 - ;; - riscv32*) - target_cpu=riscv32 - ;; - riscv64*) - target_cpu=riscv64 - ;; + arm*) target_cpu=arm ;; + aarch64*) target_cpu=arm64 ;; + riscv32*) target_cpu=riscv32 ;; + riscv64*) target_cpu=riscv64 ;; esac # Specify the platform (such as firmware). @@ -252,7 +244,7 @@ case "$platform" in emu) machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;; loongson) machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1" ;; qemu_mips) machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1" ;; - arc) machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARC=1" ;; + arc) machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARC=1" ;; esac if test x${target_cpu} = xmipsel ; then machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo mips_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`" @@ -1476,9 +1468,9 @@ int va_arg_func (int fixed, va_list args);]], [[]])], CPPFLAGS="$SAVED_CPPFLAGS" ]) -if test x"$grub_cv_cc_isystem" = xyes ; then - TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`" -fi + if test x"$grub_cv_cc_isystem" = xyes ; then + TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`" + fi fi AC_CACHE_CHECK([whether -Wtrampolines work], [grub_cv_cc_wtrampolines], [ @@ -1509,9 +1501,9 @@ AC_ARG_ENABLE([mm-debug], AS_HELP_STRING([--enable-mm-debug], [include memory manager debugging])) if test x$enable_mm_debug = xyes; then - MM_DEBUG=1 + MM_DEBUG=1 else - MM_DEBUG=0 + MM_DEBUG=0 fi AC_SUBST([MM_DEBUG]) @@ -1547,62 +1539,61 @@ AC_ARG_ENABLE([grub-emu-pci], if test "$platform" = emu; then -if test x"$enable_grub_emu_sdl" = xno ; then - grub_emu_sdl_excuse="explicitly disabled" -fi -[if [ x"$grub_emu_sdl_excuse" = x ]; then + if test x"$enable_grub_emu_sdl" = xno ; then + grub_emu_sdl_excuse="explicitly disabled" + fi + [if [ x"$grub_emu_sdl_excuse" = x ]; then # Check for libSDL libraries.] AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"], [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]]) AC_SUBST([LIBSDL]) -[fi] + [fi] -[if [ x"$grub_emu_sdl_excuse" = x ]; then + [if [ x"$grub_emu_sdl_excuse" = x ]; then # Check for headers.] AC_CHECK_HEADERS([SDL/SDL.h], [], [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]]) -[fi] + [fi] -if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then + if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then AC_MSG_ERROR([SDL support for grub-emu was explicitly requested but can't be compiled ($grub_emu_sdl_excuse)]) -fi -if test x"$grub_emu_sdl_excuse" = x ; then -enable_grub_emu_sdl=yes -else -enable_grub_emu_sdl=no -fi + fi + if test x"$grub_emu_sdl_excuse" = x ; then + enable_grub_emu_sdl=yes + else + enable_grub_emu_sdl=no + fi -if test x"$enable_grub_emu_pci" != xyes ; then - grub_emu_pci_excuse="not enabled" -fi + if test x"$enable_grub_emu_pci" != xyes ; then + grub_emu_pci_excuse="not enabled" + fi -[if [ x"$grub_emu_pci_excuse" = x ]; then - # Check for libpci libraries.] - AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"], + [if [ x"$grub_emu_pci_excuse" = x ]; then + # Check for libpci libraries.] + AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"], [grub_emu_pci_excuse=["need libpciaccess library"]]) AC_SUBST([LIBPCIACCESS]) -[fi] -[if [ x"$grub_emu_pci_excuse" = x ]; then + [fi] + [if [ x"$grub_emu_pci_excuse" = x ]; then # Check for headers.] AC_CHECK_HEADERS([pciaccess.h], [], [grub_emu_pci_excuse=["need libpciaccess headers"]]) -[fi] + [fi] -if test x"$grub_emu_pci_excuse" = x ; then -enable_grub_emu_pci=yes -else - -enable_grub_emu_pci=no -fi + if test x"$grub_emu_pci_excuse" = x ; then + enable_grub_emu_pci=yes + else + enable_grub_emu_pci=no + fi -AC_SUBST([enable_grub_emu_sdl]) -AC_SUBST([enable_grub_emu_pci]) + AC_SUBST([enable_grub_emu_sdl]) + AC_SUBST([enable_grub_emu_pci]) else -# Ignore --enable-emu-* if platform is not emu -enable_grub_emu_sdl=no -enable_grub_emu_pci=no + # Ignore --enable-emu-* if platform is not emu + enable_grub_emu_sdl=no + enable_grub_emu_pci=no fi AC_ARG_ENABLE([grub-mkfont], @@ -1634,9 +1625,9 @@ if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled ($grub_mkfont_excuse)]) fi if test x"$grub_mkfont_excuse" = x ; then -enable_grub_mkfont=yes + enable_grub_mkfont=yes else -enable_grub_mkfont=no + enable_grub_mkfont=no fi AC_SUBST([enable_grub_mkfont]) -- 2.27.0