[PATCH v3] configure: use cc/c++ when GCC not installed

diff --git a/f5/feccb1fd045a08a7192ba218f35dc20d60ab1e b/f5/feccb1fd045a08a7192ba218f35dc20d60ab1e
new file mode 100644 (file)
index 0000000..f4d5902
--- /dev/null
+++ b/f5/feccb1fd045a08a7192ba218f35dc20d60ab1e
@@ -0,0 +1,93 @@
+Return-Path: <fraser@bacardi.hollandpark.frase.id.au>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 20F9F431FC4\r
+       for <notmuch@notmuchmail.org>; Thu, 22 May 2014 03:12:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id fEpVZM5D6mQQ for <notmuch@notmuchmail.org>;\r
+       Thu, 22 May 2014 03:12:36 -0700 (PDT)\r
+Received: from captainmorgan.hollandpark.frase.id.au\r
+       (110-174-235-130.static.tpgi.com.au [110.174.235.130])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 648F3431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 22 May 2014 03:12:35 -0700 (PDT)\r
+Received: from bacardi.hollandpark.frase.id.au\r
+       (bacardi.hollandpark.frase.id.au [192.168.0.100])\r
+       by captainmorgan.hollandpark.frase.id.au (8.14.5/8.14.5) with ESMTP id\r
+       s4MACRAL032448; Thu, 22 May 2014 20:12:27 +1000 (EST)\r
+       (envelope-from fraser@bacardi.hollandpark.frase.id.au)\r
+Received: from bacardi.hollandpark.frase.id.au (localhost [127.0.0.1])\r
+       by bacardi.hollandpark.frase.id.au (8.14.7/8.14.7) with ESMTP id\r
+       s4MACRUT098842\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\r
+       verify=NO); Thu, 22 May 2014 20:12:27 +1000 (EST)\r
+       (envelope-from fraser@bacardi.hollandpark.frase.id.au)\r
+Received: (from fraser@localhost)\r
+       by bacardi.hollandpark.frase.id.au (8.14.7/8.14.7/Submit) id\r
+       s4MACRFK098841; Thu, 22 May 2014 20:12:27 +1000 (EST)\r
+       (envelope-from fraser)\r
+From: Fraser Tweedale <frase@frase.id.au>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3] configure: use cc/c++ when GCC not installed\r
+Date: Thu, 22 May 2014 20:12:22 +1000\r
+Message-Id: <1400753542-98803-1-git-send-email-frase@frase.id.au>\r
+X-Mailer: git-send-email 1.9.2\r
+In-Reply-To: <m2tx8ipycq.fsf@guru.guru-group.fi>\r
+References: <m2tx8ipycq.fsf@guru.guru-group.fi>\r
+Cc: Fraser Tweedale <frase@frase.id.au>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 22 May 2014 10:12:41 -0000\r
+\r
+Some systems (e.g. FreeBSD 10) do not ship with the GNU Compiler\r
+Collection.  Use generic cc/c++ as a fallback when gcc/g++ are not\r
+available.\r
+---\r
+ configure | 12 ++++++++++--\r
+ 1 file changed, 10 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 9bde2eb..59ab87b 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -43,8 +43,16 @@ fi\r
+ \r
+ # Set several defaults (optionally specified by the user in\r
+ # environment variables)\r
+-CC=${CC:-gcc}\r
+-CXX=${CXX:-g++}\r
++if command -v gcc >/dev/null; then\r
++    CC=${CC:-gcc}\r
++else\r
++    CC=${CC:-cc}\r
++fi\r
++if command -v g++ >/dev/null; then\r
++    CXX=${CXX:-g++}\r
++else\r
++    CXX=${CXX:-c++}\r
++fi\r
+ CFLAGS=${CFLAGS:--O2}\r
+ CPPFLAGS=${CPPFLAGS:-}\r
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}\r
+-- \r
+1.9.2\r
+\r