From f118ad4c420621dece90526b214c685104006f9b Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Fri, 23 Nov 2001 22:20:31 +0000 Subject: [PATCH] Configure new scripts. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5984 57a11ea4-9604-0410-9ed3-97b8803252fd --- gnucash.m4 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnucash.m4 b/gnucash.m4 index 0178d7c185..a6c8039d78 100644 --- a/gnucash.m4 +++ b/gnucash.m4 @@ -25,6 +25,12 @@ AC_ARG_ENABLE(gnucashtest, [ --disable-gnucashtest Do not try to compile if test x${GNUCASH_RUN_SCRIPT+set} != xset ; then GNUCASH_RUN_SCRIPT=$gnucash_config_exec_prefix/bin/gnucash-run-script fi + if test x${GNUCASH_ENV+set} != xset ; then + GNUCASH_ENV=$gnucash_config_exec_prefix/bin/gnucash-env + fi + if test x${GNC_TEST_ENV+set} != xset ; then + GNC_TEST__ENV=$gnucash_config_exec_prefix/bin/gnc-test-env + fi fi if test x$gnucash_config_prefix != x ; then gnucash_config_args="$gnucash_config_args --prefix=$gnucash_config_prefix" @@ -34,6 +40,12 @@ AC_ARG_ENABLE(gnucashtest, [ --disable-gnucashtest Do not try to compile if test x${GNUCASH_RUN_SCRIPT+set} != xset ; then GNUCASH_RUN_SCRIPT=$gnucash_config_prefix/bin/gnucash-run-script fi + if test x${GNUCASH_ENV+set} != xset ; then + GNUCASH_ENV=$gnucash_config_exec_prefix/bin/gnucash-env + fi + if test x${GNC_TEST_ENV+set} != xset ; then + GNC_TEST__ENV=$gnucash_config_exec_prefix/bin/gnc-test-env + fi fi if test "x$4" = "x"; then @@ -198,8 +210,14 @@ main () AC_SUBST(GNUCASH_CFLAGS) AC_SUBST(GNUCASH_LIBS) rm -f conf.gnucashtest + AC_PATH_PROG(GNUCASH_RUN_SCRIPT, gnucash-run-script, gnucash-run-script) AC_SUBST(GNUCASH_RUN_SCRIPT) + AC_PATH_PROG(GNUCASH_ENV, gnucash-env, gnucash-env) + AC_SUBST(GNUCASH_ENV) + AC_PATH_PROG(GNC_TEST_ENV, gnc-test-env, gnc-test-env) + AC_SUBST(GNC_TEST_ENV) + if test "$NEW_LD_PATH"x != x; then export LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH" fi