View | Details | Raw Unified | Return to ticket 4587
Collapse All | Expand All

(-)a/auxdir/x_ac_pmix.m4 (-6 / +8 lines)
Lines 32-44 AC_DEFUN([X_AC_PMIX], Link Here
32
      [
32
      [
33
        for d in $_x_ac_pmix_dirs; do
33
        for d in $_x_ac_pmix_dirs; do
34
          test -d "$d" || continue
34
          test -d "$d" || continue
35
          test -d "$d/include" || continue
35
          test -d "$d/include/pmix" || test -d "$d/include" || continue
36
          test -f "$d/include/pmix/pmix_common.h" || test -f $d/include/pmix_common.h || continue
36
          test -f "$d/include/pmix/pmix_common.h" || test -f "$d/include/pmix_common.h" || continue
37
          test -f "$d/include/pmix_server.h" || continue
37
          test -f "$d/include/pmix/pmix_server.h" || test -f "$d/include/pmix_server.h" || continue
38
          for d1 in $_x_ac_pmix_libs; do
38
          for d1 in $_x_ac_pmix_libs; do
39
            test -d "$d/$d1" || continue
39
            test -d "$d/$d1" || continue
40
            _x_ac_pmix_cppflags_save="$CPPFLAGS"
40
            _x_ac_pmix_cppflags_save="$CPPFLAGS"
41
            CPPFLAGS="-I$d/include $CPPFLAGS"
41
            CPPFLAGS="-I$d/include/pmix -I$d/include $CPPFLAGS"
42
            _x_ac_pmix_libs_save="$LIBS"
42
            _x_ac_pmix_libs_save="$LIBS"
43
            LIBS="-L$d/$d1 -lpmix $LIBS"
43
            LIBS="-L$d/$d1 -lpmix $LIBS"
44
            AC_LINK_IFELSE(
44
            AC_LINK_IFELSE(
Lines 73-79 AC_DEFUN([X_AC_PMIX], Link Here
73
              fi
73
              fi
74
74
75
              _x_ac_pmix_v1_found="1"
75
              _x_ac_pmix_v1_found="1"
76
              PMIX_V1_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
76
              PMIX_V1_CPPFLAGS="-I$x_ac_cv_pmix_dir/include/pmix -I$x_ac_cv_pmix_dir/include"
77
              if test "$ac_with_rpath" = "yes"; then
77
              if test "$ac_with_rpath" = "yes"; then
78
                PMIX_V1_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
78
                PMIX_V1_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
79
              else
79
              else
Lines 91-97 AC_DEFUN([X_AC_PMIX], Link Here
91
                AC_MSG_ERROR(err_pmix_v2 err_pmix)
91
                AC_MSG_ERROR(err_pmix_v2 err_pmix)
92
              fi
92
              fi
93
              _x_ac_pmix_v2_found="1"
93
              _x_ac_pmix_v2_found="1"
94
              PMIX_V2_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
94
              PMIX_V2_CPPFLAGS="-I$x_ac_cv_pmix_dir/include/pmix -I$x_ac_cv_pmix_dir/include"
95
              if test "$ac_with_rpath" = "yes"; then
95
              if test "$ac_with_rpath" = "yes"; then
96
                PMIX_V2_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
96
                PMIX_V2_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
97
              else
97
              else
Lines 106-113 AC_DEFUN([X_AC_PMIX], Link Here
106
        done
106
        done
107
      ])
107
      ])
108
108
109
    PMIX_LIBS="-lpmix"
109
    AC_DEFINE(HAVE_PMIX, 1, [Define to 1 if pmix library found])
110
    AC_DEFINE(HAVE_PMIX, 1, [Define to 1 if pmix library found])
110
111
112
    AC_SUBST(PMIX_LIBS)
111
    AC_SUBST(PMIX_V1_CPPFLAGS)
113
    AC_SUBST(PMIX_V1_CPPFLAGS)
112
    AC_SUBST(PMIX_V1_LDFLAGS)
114
    AC_SUBST(PMIX_V1_LDFLAGS)
113
    AC_SUBST(PMIX_V2_CPPFLAGS)
115
    AC_SUBST(PMIX_V2_CPPFLAGS)

Return to ticket 4587