Mercurial > forge
changeset 12540:18d7476a8db6 octave-forge
configure chanes: librsb-config is not anymore a requirement; if specified, LIBRSB_CXXFLAGS and LIBRSB_LIBS can override what given by librsb-config.
| author | michelemartone |
|---|---|
| date | Mon, 20 Oct 2014 08:58:20 +0000 |
| parents | b8f0148a86f1 |
| children | 823dd72f5d3e |
| files | main/sparsersb/src/autogen.sh main/sparsersb/src/configure.base |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/main/sparsersb/src/autogen.sh Mon Oct 20 08:43:49 2014 +0000 +++ b/main/sparsersb/src/autogen.sh Mon Oct 20 08:58:20 2014 +0000 @@ -6,10 +6,16 @@ cat configure.base >> configure.in cat <<EOF >> configure.in AC_PATH_PROG(LIBRSB_CONFIG,librsb-config) -test -z "\$LIBRSB_CONFIG" && AC_MSG_ERROR('librsb-config not found in the path. Did you install librsb ?') -if test x\$LIBRSB_CONFIG = x ; then LIBRSB_CONFIG=librsb-config ; fi -LIBRSB_CXXFLAGS="\`\$LIBRSB_CONFIG --cflags\`" -LIBRSB_LIBS="\`\$LIBRSB_CONFIG --ldflags | sed 's/ -static/ /g'\` -lgomp" +dnl +dnl test -z "\$LIBRSB_CONFIG" && AC_MSG_ERROR('librsb-config not found in the path. Did you install librsb ?') +dnl if test x\$LIBRSB_CONFIG = x ; then LIBRSB_CONFIG=librsb-config ; fi +dnl +if test x"\$LIBRSB_CXXFLAGS" = x ; then + LIBRSB_CXXFLAGS="\`\$LIBRSB_CONFIG --cflags\`" +fi +if test x"\$LIBRSB_LIBS" = x ; then + LIBRSB_LIBS="\`\$LIBRSB_CONFIG --ldflags | sed 's/ -static/ /g'\` -lgomp" +fi AC_OPENMP([]) ## STATUS_MSG="
--- a/main/sparsersb/src/configure.base Mon Oct 20 08:43:49 2014 +0000 +++ b/main/sparsersb/src/configure.base Mon Oct 20 08:58:20 2014 +0000 @@ -65,7 +65,7 @@ AC_SUBST(altopath) dnl AC_SUBST(LIBRSB_CONFIG) -AC_ARG_VAR([LIBRSB_CONFIG],[Pathname to the librsb-config script (MANDATORY!).]) +AC_ARG_VAR([LIBRSB_CONFIG],[Pathname to the librsb-config script.]) AC_SUBST(SPARSERSB_LIBS) AC_ARG_VAR([SPARSERSB_LIBS],[Additional libraries you want to link sparsersb against.]) AC_SUBST(LIBRSB_LIBS)