Commit 3a4eaea2 authored by Karl Wette's avatar Karl Wette
Browse files

SWIG: remove SWIG_USER_ENV and set OCTAVE_PATH in user environment scripts

- if Octave module is not configured, $(octexecdir) will be empty and
  OCTAVE_PATH will not be added to environment
Original: a3f1f140433694f079b79e135056c143126142a8
parent 29bd76a3
# SWIG configuration
# Author: Karl Wette, 2011, 2012
#
# serial 32
# serial 33
# enable SWIG wrapping modules
AC_DEFUN([LALSUITE_ENABLE_SWIG],[
......@@ -245,9 +245,6 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
])
# string to add to user environment setup scripts
AC_SUBST(SWIG_USER_ENV,[""])
# configure SWIG languages
LALSUITE_USE_SWIG_OCTAVE
LALSUITE_USE_SWIG_PYTHON
......@@ -390,9 +387,6 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
AC_MSG_RESULT([${octexecdir}])
AC_SUBST(octexecdir)
# string to add to user environment setup scripts
SWIG_USER_ENV="${SWIG_USER_ENV}"'prepend OCTAVE_PATH $(octexecdir)\n'
])
])
......
......@@ -59,7 +59,7 @@ lal-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir) $(pythondir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lal-user-env.csh lal-user-env.sh: lal-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -69,7 +69,7 @@ lalburst-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalburst-user-env.csh lalburst-user-env.sh: lalburst-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -46,7 +46,7 @@ laldetchar-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONDIR $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
laldetchar-user-env.csh laldetchar-user-env.sh: laldetchar-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -80,7 +80,7 @@ lalframe-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalframe-user-env.csh lalframe-user-env.sh: lalframe-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -66,7 +66,7 @@ lalinference-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalinference-user-env.csh lalinference-user-env.sh: lalinference-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -255,7 +255,7 @@ lalinspiral-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalinspiral-user-env.csh lalinspiral-user-env.sh: lalinspiral-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -50,7 +50,7 @@ lalmetaio-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalmetaio-user-env.csh lalmetaio-user-env.sh: lalmetaio-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -161,7 +161,7 @@ lalpulsar-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalpulsar-user-env.csh lalpulsar-user-env.sh: lalpulsar-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -123,7 +123,7 @@ lalsimulation-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalsimulation-user-env.csh lalsimulation-user-env.sh: lalsimulation-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -51,7 +51,7 @@ lalstochastic-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalstochastic-user-env.csh lalstochastic-user-env.sh: lalstochastic-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
......@@ -39,7 +39,7 @@ lalxml-user-env.shell: Makefile $(srcdir)/generate_user_env.awk
@echo "prepend PKG_CONFIG_PATH $(libdir)/pkgconfig" >>$@
@echo "prepend PYTHONPATH $(pyexecdir)" >>$@
@echo "prepend LAL_DATA_PATH $(pkgdatadir)" >>$@
@printf "$(SWIG_USER_ENV)" >>$@
@echo "prepend OCTAVE_PATH $(octexecdir)" >>$@
lalxml-user-env.csh lalxml-user-env.sh: lalxml-user-env.shell $(srcdir)/generate_user_env.awk
$(AM_V_GEN)$(AWK) -f $(srcdir)/generate_user_env.awk -v SED=$(SED) -v package=$(PACKAGE_NAME) -v output=$@ $< || { rm -f $@; exit 1; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment