IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1401 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-11-20 16:21:54 +00:00
parent 4fb3c2c397
commit 07bef2a5d3
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configure vendored
View File

@ -2365,9 +2365,9 @@ fi
rm -f conftest* rm -f conftest*
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -lqthreads" GNC_TEST_LIBS="-lguile -lreadline -ldl -lm"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2374 "configure" #line 2374 "configure"
@ -2388,9 +2388,9 @@ rm -f conftest*
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -ltermcap" GNC_TEST_LIBS="-lguile -lqthreads"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2397 "configure" #line 2397 "configure"
@ -2411,9 +2411,9 @@ rm -f conftest*
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -lqthreads -ltermcap" GNC_TEST_LIBS="-lguile -ltermcap"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2420 "configure" #line 2420 "configure"
@ -2434,7 +2434,30 @@ rm -f conftest*
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then
GNC_TEST_LIBS="-lguile -lqthreads -ltermcap"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
cat > conftest.$ac_ext <<EOF
#line 2443 "configure"
#include "confdefs.h"
#include<guile/gh.h>
int main() {
gh_eval_file;
; return 0; }
EOF
if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
LIBS="${LIBS_SAFE}"
fi
if test x"${GUILELIBS}" = x;
then then
{ echo "configure: error: Cannot link with guile. Do you have guile 1.3 installed?" 1>&2; exit 1; } { echo "configure: error: Cannot link with guile. Do you have guile 1.3 installed?" 1>&2; exit 1; }
fi fi
@ -2447,7 +2470,7 @@ echo "$ac_t""yes" 1>&6
### Plotutils ### Plotutils
echo $ac_n "checking for openpl in -lplot""... $ac_c" 1>&6 echo $ac_n "checking for openpl in -lplot""... $ac_c" 1>&6
echo "configure:2451: checking for openpl in -lplot" >&5 echo "configure:2474: checking for openpl in -lplot" >&5
ac_lib_var=`echo plot'_'openpl | sed 'y%./+-%__p_%'` ac_lib_var=`echo plot'_'openpl | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -2455,7 +2478,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lplot $X_PRE_LIBS $MOTIF_LIBS $X_EXTRA_LIBS -lXaw $X_LIBS $LIBS" LIBS="-lplot $X_PRE_LIBS $MOTIF_LIBS $X_EXTRA_LIBS -lXaw $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2459 "configure" #line 2482 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -2466,7 +2489,7 @@ int main() {
openpl() openpl()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else

17
configure.in
View File

@ -171,7 +171,16 @@ AC_TRY_LINK([#include<guile/gh.h>], [gh_eval_file;],
GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}") GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}")
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then
GNC_TEST_LIBS="-lguile -lreadline -ldl -lm"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
AC_TRY_LINK([#include<guile/gh.h>], [gh_eval_file;],
GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}")
LIBS="${LIBS_SAFE}"
fi
if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -lqthreads" GNC_TEST_LIBS="-lguile -lqthreads"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
@ -180,7 +189,7 @@ then
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -ltermcap" GNC_TEST_LIBS="-lguile -ltermcap"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
@ -189,7 +198,7 @@ then
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
GNC_TEST_LIBS="-lguile -lqthreads -ltermcap" GNC_TEST_LIBS="-lguile -lqthreads -ltermcap"
LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}" LIBS="${LIBS} ${GNC_LIBS_HELPER} ${GNC_TEST_LIBS}"
@ -198,7 +207,7 @@ then
LIBS="${LIBS_SAFE}" LIBS="${LIBS_SAFE}"
fi fi
if test x"${GUILELIBS}" == x; if test x"${GUILELIBS}" = x;
then then
AC_MSG_ERROR(Cannot link with guile. Do you have guile 1.3 installed?) AC_MSG_ERROR(Cannot link with guile. Do you have guile 1.3 installed?)
fi fi