From: Ralf Wildenhues Date: Sun, 21 Jan 2007 14:57:58 +0000 (+0000) Subject: * libltdl/config/ltmain.m4sh (func_mode_compile): Accept X-Git-Tag: release-2-1b~225 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d8e7a3784ccb93e9ca8dfbc31841c88b998bb7a;p=thirdparty%2Flibtool.git * libltdl/config/ltmain.m4sh (func_mode_compile): Accept suffixes matching `[fF][09].', for Fortran. * tests/suffix.test: Also test F90, F95, f03, F03. --- diff --git a/ChangeLog b/ChangeLog index 04af9d463..956f9b1dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 2007-01-21 Ralf Wildenhues + * libltdl/config/ltmain.m4sh (func_mode_compile): Accept + suffixes matching `[fF][09].', for Fortran. + * tests/suffix.test: Also test F90, F95, f03, F03. + * Makefile.am (EXTRA_DIST): Add ChangeLog.2006. - * ChangeLog.2006: New, rotated, from.. - * ChangeLog: ..here. + * ChangeLog.2006: New, rotated, from... + * ChangeLog: ...here. 2007-01-21 Ralf Wildenhues diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index eb90f4d63..fa2cd0faa 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -4,8 +4,7 @@ m4_divert_push([SCRIPT])# @configure_input@ # ltmain.sh (GNU @PACKAGE@@TIMESTAMP@) @VERSION@ # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -1312,7 +1311,7 @@ func_mode_compile () *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f9?) xform=f9. ;; + *.[[fF]][[09]]?) xform='[[fF]][[09]].' ;; *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; diff --git a/tests/suffix.test b/tests/suffix.test index 4f81a135d..07021fa29 100755 --- a/tests/suffix.test +++ b/tests/suffix.test @@ -1,7 +1,7 @@ #! /bin/sh # suffix.test - check that libtool knows how to transform source suffices. -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,7 +23,7 @@ # Extensions taken from the ones that Automake recognizes, plus Objective C, # and GNU Ada. -extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 f95 for m s" +extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 F90 f95 F95 f03 F03 for m s" bad_names="foo." . tests/defs || exit 1