diff options
| author | Paul Smith <psmith@gnu.org> | 2012-01-16 03:53:34 +0000 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2012-01-16 03:53:34 +0000 |
| commit | 0bdc1915017d91fb8e5474a4bec80f79eb207cff (patch) | |
| tree | 3bf6df65d848fda34e1cbfd144f76b0a3caec316 /config | |
| parent | 49cc211819851b76c58fb37eeb579bd88a5ac65a (diff) | |
| download | make-0bdc1915017d91fb8e5474a4bec80f79eb207cff.tar.gz | |
Fix autoconf macros for detecting DOS-style pathnames.
Fixes Savannah bug #35256.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/dospaths.m4 | 22 |
2 files changed, 14 insertions, 13 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index a6abfa3..95f1157 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2012-01-15 Paul Smith <psmith@gnu.org> + + * dospaths.m4: Use AC_LANG_PROGRAM to encapsulate the test code. + Fixes Savannah bug #35256. Patch from Sebastian Pipping. + 2006-03-09 Paul Smith <psmith@gnu.org> * dospaths.m4: Add MSYS to the list of targets allowing DOS-style diff --git a/config/dospaths.m4 b/config/dospaths.m4 index 0615f0a..b341aca 100644 --- a/config/dospaths.m4 +++ b/config/dospaths.m4 @@ -19,21 +19,17 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/>. -AC_DEFUN([pds_AC_DOS_PATHS], - [ - AC_CACHE_CHECK([whether system uses MSDOS-style paths], [ac_cv_dos_paths], - [ - AC_COMPILE_IFELSE([ +AC_DEFUN([pds_AC_DOS_PATHS], [ + AC_CACHE_CHECK([whether system uses MSDOS-style paths], [ac_cv_dos_paths], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __EMX__ && !defined __MSYS__ && !defined __CYGWIN__ neither MSDOS nor Windows nor OS2 #endif -], +]])], [ac_cv_dos_paths=yes], - [ac_cv_dos_paths=no]) - ]) + [ac_cv_dos_paths=no])]) - if test x"$ac_cv_dos_paths" = xyes; then - AC_DEFINE_UNQUOTED([HAVE_DOS_PATHS], 1, - [Define if the system uses DOS-style pathnames.]) - fi - ]) + AS_IF([test x"$ac_cv_dos_paths" = xyes], + [ AC_DEFINE_UNQUOTED([HAVE_DOS_PATHS], 1, + [Define if the system uses DOS-style pathnames.])]) +]) |