From: Akim Demaille <akim@epita.fr>
Date: Wed, 24 May 2000 15:50:19 +0000 (+0000)
Subject: * aclang.m4 (AC_LANG(C++)): Change `ac_ext' from from `C' to `cc'
X-Git-Tag: autoconf-2.50~869
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a72866dbfe237260b6739020fe351638f135c901;p=thirdparty%2Fautoconf.git

* aclang.m4 (AC_LANG(C++)): Change `ac_ext' from from `C' to `cc'
to avoid potential ambiguities on case-insensitive shells.
---

diff --git a/ChangeLog b/ChangeLog
index e094032fc..e44fb5edb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-24  Ossama Othman  <ossama@debian.org>
+
+	* aclang.m4 (AC_LANG(C++)): Change `ac_ext' from from `C' to `cc'
+	to avoid potential ambiguities on case-insensitive shells.
+
 2000-05-24  Mo DeJong  <mdejong@cygnus.com>
 
 	Have --host=sun4 automatically look for CC=sun4-cc etc.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 213ff55f5..b3285ccfe 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1624,9 +1624,9 @@ AC_CONFIG_SRCDIR([$1])], [[AC_INIT]])])[]dnl
 # Note that the order is important: first initialize, then set the
 # AC_CONFIG_SRCDIR.
 AC_DEFUN([AC_INIT],
-[AC_EXPAND_ONCE([_AC_INIT()])dnl
-ifval([$2], [_AC_INIT_PACKAGE($@)],
-            [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
+[ifval([$2], [_AC_INIT_PACKAGE($@)])dnl
+AC_EXPAND_ONCE([_AC_INIT()])dnl
+ifval([$2], , [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
 ])
 
 
diff --git a/aclang.m4 b/aclang.m4
index c0a85ccf4..fb4703b7f 100644
--- a/aclang.m4
+++ b/aclang.m4
@@ -186,7 +186,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG(C++)
 # ------------
 define([AC_LANG(C++)],
-[ac_ext=C
+[ac_ext=cc
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&AC_FD_LOG'
@@ -719,12 +719,12 @@ AC_LANG_POP
 define([_AC_PROG_CXX_GNU],
 [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
-cat >conftest.C <<EOF
+cat >conftest.cc <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then
+if AC_TRY_COMMAND(${CXX-g++} -E conftest.cc) | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index c0a85ccf4..fb4703b7f 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -186,7 +186,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG(C++)
 # ------------
 define([AC_LANG(C++)],
-[ac_ext=C
+[ac_ext=cc
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&AC_FD_LOG'
@@ -719,12 +719,12 @@ AC_LANG_POP
 define([_AC_PROG_CXX_GNU],
 [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
-cat >conftest.C <<EOF
+cat >conftest.cc <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then
+if AC_TRY_COMMAND(${CXX-g++} -E conftest.cc) | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index c0a85ccf4..fb4703b7f 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -186,7 +186,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG(C++)
 # ------------
 define([AC_LANG(C++)],
-[ac_ext=C
+[ac_ext=cc
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&AC_FD_LOG'
@@ -719,12 +719,12 @@ AC_LANG_POP
 define([_AC_PROG_CXX_GNU],
 [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
-cat >conftest.C <<EOF
+cat >conftest.cc <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then
+if AC_TRY_COMMAND(${CXX-g++} -E conftest.cc) | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 213ff55f5..b3285ccfe 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1624,9 +1624,9 @@ AC_CONFIG_SRCDIR([$1])], [[AC_INIT]])])[]dnl
 # Note that the order is important: first initialize, then set the
 # AC_CONFIG_SRCDIR.
 AC_DEFUN([AC_INIT],
-[AC_EXPAND_ONCE([_AC_INIT()])dnl
-ifval([$2], [_AC_INIT_PACKAGE($@)],
-            [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
+[ifval([$2], [_AC_INIT_PACKAGE($@)])dnl
+AC_EXPAND_ONCE([_AC_INIT()])dnl
+ifval([$2], , [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
 ])
 
 
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index c0a85ccf4..fb4703b7f 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -186,7 +186,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG(C++)
 # ------------
 define([AC_LANG(C++)],
-[ac_ext=C
+[ac_ext=cc
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&AC_FD_LOG'
@@ -719,12 +719,12 @@ AC_LANG_POP
 define([_AC_PROG_CXX_GNU],
 [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
-cat >conftest.C <<EOF
+cat >conftest.cc <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then
+if AC_TRY_COMMAND(${CXX-g++} -E conftest.cc) | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no