casa-mp-base
Public
Commits
Ryan Schmidt authored a3fd205aa9b
| 1 - | --- configure.ac.orig 2013-11-16 07:15:30.000000000 -0600 |
| 2 - | +++ configure.ac 2014-09-28 21:55:55.000000000 -0500 |
| 3 - | |
| 4 - | m4_include([m4/acinclude.m4]) |
| 1 + | --- configure.ac.orig 2017-06-23 19:57:09.000000000 -0500 |
| 2 + | +++ configure.ac 2017-11-28 08:50:54.000000000 -0600 |
| 3 + | |
| 4 + | m4_include([m4/acx_pthread.m4]) |
| 5 5 | ACX_PTHREAD() |
| 6 6 | |
| 7 7 | -if test x"${cross_compiling}" = "xno" ; then |
| 8 8 | - # Bring additional directories where things might be found into our |
| 9 9 | - # search path. I don't know why autoconf doesn't do this by default |
| 10 - | - for spfx in /usr/local /opt/local /sw ${prefix} ; do |
| 10 + | - for spfx in ${prefix} /sw /opt/local /usr/local ; do |
| 11 11 | - AC_MSG_NOTICE([checking ${spfx}/include]) |
| 12 12 | - if test -d ${spfx}/include; then |
| 13 - | - CPPFLAGS="-I${spfx}/include $CPPFLAGS" |
| 14 - | - LDFLAGS="-L${spfx}/lib $LDFLAGS" |
| 13 + | - CPPFLAGS="$CPPFLAGS -I${spfx}/include" |
| 14 + | - LDFLAGS="$LDFLAGS -L${spfx}/lib" |
| 15 15 | - AC_MSG_NOTICE([ *** ADDING ${spfx}/include to CPPFLAGS *** ]) |
| 16 16 | - AC_MSG_NOTICE([ *** ADDING ${spfx}/lib to LDFLAGS *** ]) |
| 17 17 | - fi |
| 18 18 | - done |
| 19 19 | - AC_MSG_NOTICE([ CPPFLAGS = ${CPPFLAGS} ]) |
| 20 20 | - AC_MSG_NOTICE([ LDFLAGS = ${LDFLAGS} ]) |
| 21 21 | -else |
| 22 22 | +if test x"${cross_compiling}" != "xno" ; then |
| 23 23 | AC_MSG_NOTICE([Cross Compiling --- will not update CPPFALGS or LDFLAGS with /usr/local, /opt/local or /sw]) |
| 24 24 | LIBS="$LIBS -lws2_32 -lgdi32" |
| 25 25 | fi |