From: Ralf Wildenhues Date: Mon, 12 Nov 2007 19:34:44 +0000 (+0100) Subject: Avoid warnings about conftest.dSYM directories on Mac OS X Leopard. X-Git-Tag: v2.62~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8beeb3dcd4df6f97183ab29f68c6b3dcc8e844;p=thirdparty%2Fautoconf.git Avoid warnings about conftest.dSYM directories on Mac OS X Leopard. * lib/autoconf/general.m4 (_AC_LINK_IFELSE, _AC_RUN_IFELSE): Remove conftest.dSYM directory. * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT) (_AC_LANG_PROGRAM_C_, _AC_FC_MAIN, __AC_FC_NAME_MANGLING): Remove `conftest.*' recursively. * lib/autoconf/lang.m4 (AC_LINK_IFELSE): Likewise. * lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE): Likewise. (_AC_COMPILER_OBJEXT_REJECT): Reject *.dSYM. * THANKS: Update. Report and analysis by Jeff Squyres and Peter O'Gorman. --- diff --git a/ChangeLog b/ChangeLog index 459bb6c7..94220567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-11-12 Ralf Wildenhues + + Avoid warnings about conftest.dSYM directories on Mac OS X Leopard. + * lib/autoconf/general.m4 (_AC_LINK_IFELSE, _AC_RUN_IFELSE): + Remove conftest.dSYM directory. + * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT) + (_AC_LANG_PROGRAM_C_, _AC_FC_MAIN, __AC_FC_NAME_MANGLING): + Remove `conftest.*' recursively. + * lib/autoconf/lang.m4 (AC_LINK_IFELSE): Likewise. + * lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE): + Likewise. + (_AC_COMPILER_OBJEXT_REJECT): Reject *.dSYM. + * THANKS: Update. + Report and analysis by Jeff Squyres and Peter O'Gorman. + 2007-11-12 Benoit Sigoure Fix typos in variable names. diff --git a/THANKS b/THANKS index 4faae015..6e5ca5b5 100644 --- a/THANKS +++ b/THANKS @@ -146,6 +146,7 @@ James A. Lupo lupoja@feynman.ml.wpafb.af.mil Jason Molenda jsm@cygnus.com Jeff Garzik jgarzik@pobox.com Jeff Painter ? +Jeff Squyres jsquyres@cisco.com Jeffrey A Law law@cygnus.com Jeffrey J. Barteet ? Jennis Pruett ? diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index 0907e40b..d5828675 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -553,7 +553,7 @@ ac_[]_AC_LANG_ABBREV[]_v_output=`eval $ac_link AS_MESSAGE_LOG_FD>&1 2>&1 | grep AS_ECHO(["$ac_[]_AC_LANG_ABBREV[]_v_output"]) >&AS_MESSAGE_LOG_FD _AC_LANG_PREFIX[]FLAGS=$ac_save_FFLAGS -rm -f conftest* +rm -rf conftest* # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where # /foo, /bar, and /baz are search directories for the Fortran linker. @@ -823,7 +823,7 @@ AC_CACHE_CHECK([for dummy main to link with _AC_LANG libraries], fi AC_LANG_POP(C)dnl ac_cv_[]_AC_LANG_ABBREV[]_dummy_main=$ac_cv_fortran_dummy_main - rm -f conftest* + rm -rf conftest* LIBS=$ac_[]_AC_LANG_ABBREV[]_dm_save_LIBS ]) []_AC_FC[]_DUMMY_MAIN=$ac_cv_[]_AC_LANG_ABBREV[]_dummy_main @@ -892,7 +892,7 @@ AC_CACHE_CHECK([for alternate main to link with _AC_LANG libraries], done AC_LANG_POP(C)dnl ac_cv_[]_AC_LANG_ABBREV[]_main=$ac_cv_fortran_main - rm -f conftest* + rm -rf conftest* LIBS=$ac_[]_AC_LANG_ABBREV[]_m_save_LIBS ]) AC_DEFINE_UNQUOTED([]_AC_FC[]_MAIN, $ac_cv_[]_AC_LANG_ABBREV[]_main, @@ -1004,7 +1004,8 @@ AC_CACHE_CHECK([for _AC_LANG name-mangling scheme], fi LIBS=$ac_save_LIBS - rm -f cfortran_test* conftest*], + rm -rf conftest* + rm -f cfortran_test*], [AC_MSG_FAILURE([cannot compile a simple Fortran program])]) ]) ])# __AC_FC_NAME_MANGLING diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 2834e25c..69b43712 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2493,6 +2493,7 @@ AS_IF([_AC_DO_STDERR($ac_link) && { dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization) dnl information created by the PGI compiler (conftest_ipa8_conftest.oo), dnl as it would interfere with the next link command. +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl ])# _AC_LINK_IFELSE @@ -2548,6 +2549,7 @@ _AC_MSG_LOG_CONFTEST m4_ifvaln([$3], [( exit $ac_status ) $3])dnl])[]dnl +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl ])# _AC_RUN_IFELSE diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4 index b659b9fe..9a82d570 100644 --- a/lib/autoconf/lang.m4 +++ b/lib/autoconf/lang.m4 @@ -401,6 +401,9 @@ m4_divert_pop()dnl # # - *.map, *.inf # Created by the Green Hills compiler. +# +# - *.dSYM +# Directory created on Mac OS X Leopard. # _AC_COMPILER_OBJEXT_REJECT @@ -408,7 +411,7 @@ m4_divert_pop()dnl # Case/esac pattern matching the files to be ignored when looking for # compiled object files. m4_define([_AC_COMPILER_OBJEXT_REJECT], -[*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf]) +[*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM]) # _AC_COMPILER_EXEEXT_REJECT diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 2c9eef75..c5624a85 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -142,7 +142,7 @@ case $$3 in #( no | unknown) ;; *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; esac -rm -f conftest*[]dnl +rm -rf conftest*[]dnl ])# _AC_SYS_LARGEFILE_MACRO_VALUE