Changeset 3852


Ignore:
Timestamp:
Oct 11, 2018 8:30:47 PM (12 months ago)
Author:
lou
Message:

Add newlines to the end of m4_foreach stanzas so that statements don't run
together.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r3850 r3852  
    546546    [AC_SUBST(m4_toupper(myvar)_LFLAGS)
    547547     AC_SUBST(m4_toupper(myvar)_CFLAGS)
    548      AC_SUBST(m4_toupper(myvar)_PCFILES)])
     548     AC_SUBST(m4_toupper(myvar)_PCFILES)
     549    ])
    549550
    550551# Add the .pc file and augment LFLAGS and CFLAGS.
     
    562563         AC_MSG_NOTICE([m4_toupper(myvar)_LFLAGS: "${m4_toupper(myvar)_LFLAGS}"])
    563564         AC_MSG_NOTICE([m4_toupper(myvar)_CFLAGS: "${m4_toupper(myvar)_CFLAGS}"])
    564        fi ; ])
     565       fi
     566      ])
    565567
    566568])   # COIN_CHK_HERE
     
    896898    [AC_SUBST(m4_toupper(myvar)_LFLAGS)
    897899     AC_SUBST(m4_toupper(myvar)_CFLAGS)
    898      AC_SUBST(m4_toupper(myvar)_PCFILES)])
     900     AC_SUBST(m4_toupper(myvar)_PCFILES)
     901    ])
    899902
    900903# Check to see if the user has set an override to skip this primary.
     
    944947      [m4_toupper(myvar)_PCFILES="$m4_tolower($1_pcfiles) $m4_toupper(myvar)_PCFILES"
    945948       m4_toupper(myvar)_LFLAGS="$m4_tolower($1_lflags) $m4_toupper(myvar)_LFLAGS"
    946        m4_toupper(myvar)_CFLAGS="$m4_tolower($1_cflags) $m4_toupper(myvar)_CFLAGS"])
     949       m4_toupper(myvar)_CFLAGS="$m4_tolower($1_cflags) $m4_toupper(myvar)_CFLAGS"
     950      ])
    947951
    948952# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    12211225  m4_foreach_w([myvar],[$2],
    12221226    [AC_SUBST(m4_toupper(myvar)_LFLAGS)
    1223      AC_SUBST(m4_toupper(myvar)_CFLAGS)])
     1227     AC_SUBST(m4_toupper(myvar)_CFLAGS)
     1228    ])
    12241229
    12251230# Check to see if the user has overridden configure parameters from the
     
    12691274    m4_foreach_w([myvar],[$2],
    12701275      [m4_toupper(myvar)_LFLAGS="$m4_tolower($1_lflags) $m4_toupper(myvar)_LFLAGS"
    1271        m4_toupper(myvar)_CFLAGS="$m4_tolower($1_cflags) $m4_toupper(myvar)_CFLAGS"])
     1276       m4_toupper(myvar)_CFLAGS="$m4_tolower($1_cflags) $m4_toupper(myvar)_CFLAGS"
     1277      ])
    12721278
    12731279# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    12971303    [if test "$ac_cv_search_cos" != 'none required' ; then
    12981304       m4_foreach_w([myvar],[$1],
    1299          [m4_toupper(myvar)_LFLAGS="$ac_cv_search_cos $m4_toupper(myvar)_LFLAGS"])
     1305         [m4_toupper(myvar)_LFLAGS="$ac_cv_search_cos $m4_toupper(myvar)_LFLAGS"
     1306         ])
    13001307     fi])
    13011308  LIBS="$coin_save_LIBS"
     
    13321339    if test x$coin_has_zlib = xyes ; then
    13331340      m4_foreach_w([myvar],[$1],
    1334         [m4_toupper(myvar)_LFLAGS="-lz $m4_toupper(myvar)_LFLAGS"])
     1341        [m4_toupper(myvar)_LFLAGS="-lz $m4_toupper(myvar)_LFLAGS"
     1342        ])
    13351343      AC_DEFINE([COIN_HAS_ZLIB],[1],[Define to 1 if zlib is available])
    13361344    fi
     
    13711379    if test $coin_has_bzlib = yes ; then
    13721380      m4_foreach_w([myvar],[$1],
    1373         [m4_toupper(myvar)_LFLAGS="-lbz2 $m4_toupper(myvar)_LFLAGS"])
     1381        [m4_toupper(myvar)_LFLAGS="-lbz2 $m4_toupper(myvar)_LFLAGS"
     1382        ])
    13741383      AC_DEFINE([COIN_HAS_BZLIB],[1],[Define to 1 if bzlib is available])
    13751384    fi
     
    14081417    if test $coin_has_gmp = yes ; then
    14091418      m4_foreach_w([myvar],[$1],
    1410         [m4_toupper(myvar)_LFLAGS="-lgmp $m4_toupper(myvar)_LFLAGS"])
     1419        [m4_toupper(myvar)_LFLAGS="-lgmp $m4_toupper(myvar)_LFLAGS"
     1420        ])
    14111421      AC_DEFINE([COIN_HAS_GMP],[1],[Define to 1 if GMP is available])
    14121422    fi
     
    14571467    if test $coin_has_readline = yes ; then
    14581468      m4_foreach_w([myvar],[$1],
    1459         [m4_toupper(myvar)_LFLAGS="-lreadline $m4_toupper(myvar)_LFLAGS"])
     1469        [m4_toupper(myvar)_LFLAGS="-lreadline $m4_toupper(myvar)_LFLAGS"
     1470        ])
    14601471      AC_DEFINE([COIN_HAS_READLINE],[1],[Define to 1 if readline is available])
    14611472    fi
     
    16441655        AC_MSG_NOTICE([m4_toupper(myvar)_LFLAGS: "${m4_toupper(myvar)_LFLAGS}"])
    16451656        AC_MSG_NOTICE([m4_toupper(myvar)_CFLAGS: "${m4_toupper(myvar)_CFLAGS}"])
    1646       fi ; ])
     1657      fi
     1658    ])
    16471659])
    16481660
  • trunk/coin_fortran.m4

    r3848 r3852  
    340340    [AC_SUBST(m4_toupper(myvar)_LFLAGS)
    341341     AC_SUBST(m4_toupper(myvar)_CFLAGS)
    342      AC_SUBST(m4_toupper(myvar)_PCFILES)])
     342     AC_SUBST(m4_toupper(myvar)_PCFILES)
     343    ])
    343344
    344345# Set up command line arguments with DEF_PRIM_ARGS and give FIND_PRIM_PKG
     
    433434      [m4_toupper(myvar)_PCFILES="$blas_pcfiles $m4_toupper(myvar)_PCFILES"
    434435       m4_toupper(myvar)_LFLAGS="$blas_lflags $m4_toupper(myvar)_LFLAGS"
    435        m4_toupper(myvar)_CFLAGS="$blas_cflags $m4_toupper(myvar)_CFLAGS"])
     436       m4_toupper(myvar)_CFLAGS="$blas_cflags $m4_toupper(myvar)_CFLAGS"
     437      ])
    436438  else
    437439    AC_MSG_RESULT([$coin_has_blas])
     
    474476    [AC_SUBST(m4_toupper(myvar)_LIBS)
    475477     AC_SUBST(m4_toupper(myvar)_CFLAGS)
    476      AC_SUBST(m4_toupper(myvar)_PCFILES)])
     478     AC_SUBST(m4_toupper(myvar)_PCFILES)
     479    ])
    477480
    478481# Set up command line arguments with DEF_PRIM_ARGS and give FIND_PRIM_PKG
     
    545548      [m4_toupper(myvar)_PCFILES="$lapack_pcfiles $m4_toupper(myvar)_PCFILES"
    546549       m4_toupper(myvar)_LFLAGS="$lapack_lflags $m4_toupper(myvar)_LFLAGS"
    547        m4_toupper(myvar)_CFLAGS="$lapack_cflags $m4_toupper(myvar)_CFLAGS"])
     550       m4_toupper(myvar)_CFLAGS="$lapack_cflags $m4_toupper(myvar)_CFLAGS"
     551      ])
    548552  else
    549553    AC_MSG_RESULT([$coin_has_lapack])
Note: See TracChangeset for help on using the changeset viewer.