Changeset 3716


Ignore:
Timestamp:
Nov 10, 2017, 7:07:39 AM (18 months ago)
Author:
Peter
Message:

Change rule in yat-config when /usr/local/include is output in
--cppflags. Rather than checking when CXX is g++, we check that
variable GXX is yes and host os is linux.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/Makefile.am

    r3715 r3716  
    3535  -e 's|@libdir[@]|$(libdir)|g' \
    3636  -e 's|@includedir[@]|$(includedir)|g' \
     37  -e 's|@host_os[@]|$(host_os)|g' \
     38  -e 's|@GXX[@]|$(GXX)|g' \
    3739  -e 's|@CXX[@]|$(CXX)|g' \
    3840  -e 's|@CXXCPP[@]|$(CXXCPP)|g' \
  • trunk/build_support/yat-config.in

    r3715 r3716  
    3030installed=no
    3131
     32host_os="@host_os@"
     33GXX="@GXX@"
    3234CXX="@CXX@"
    3335CXXCPP="@CXXCPP@"
     
    125127    --cppflags)
    126128    if test $installed = yes; then
     129       # add $includedir unless
     130       #   1) $includedir is /usr/include or
     131       #   2) $includedir is /usr/local/include on linux
     132       add_path=yes
    127133       if test "x$includedir" = "x/usr/include"; then
    128          : # ignore standard include
    129        elif (test "$CXX" = "g++" &&
    130              test "x$includedir" = "x/usr/local/include"); then
    131          : # ignore /usr/local/include if we use g++
    132        else
     134          add_path=no
     135       elif (test "x$includedir" = "x/usr/local/include" &&
     136             test x"$GXX" = x"yes"); then
     137    case $host_os in
     138         linux* | gnu* | k*bsd*-gnu) add_path=no;;
     139    esac
     140       fi
     141       if test x"$add_path" = x"yes"; then
    133142         flags="$flags -I$includedir"
    134143       fi
  • trunk/configure.ac

    r3715 r3716  
    630630AC_SUBST([YAT_CONFIG_LDFLAGS])
    631631
     632AC_SUBST([GXX])
    632633AC_SUBST(YAT_LIBS)
    633634AC_SUBST(YAT_CBLAS_LIB)
Note: See TracChangeset for help on using the changeset viewer.