From 7db64257c28d097385b333cf4c30d535936d5427 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Sat, 9 Jan 1999 09:26:05 +0000 Subject: [PATCH] fixes from Andrew Arensburger git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1592 57a11ea4-9604-0410-9ed3-97b8803252fd --- Makefile.in | 2 +- Makefile.init.in | 2 -- configure | 77 +++++++++++++++++++++++++----------------------- configure.in | 13 ++++---- 4 files changed, 49 insertions(+), 45 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8d77af51b..26eab8739c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,7 +83,7 @@ DIST_TRASH += gnucash.motif gnucash.motif.static DIST_TRASH += gnucash.gnome gnucash.gnome.static gnucash.qt gnucash-shell DIST_TRASH += config.cache config.log config.status config.h -tagsfiles := $(shell find -name "*.[ch]") +tagsfiles := $(find -name "*.[ch]") TAGS: ${tagsfiles} etags ${tagsfiles} diff --git a/Makefile.init.in b/Makefile.init.in index 84d55986a5..0d0ea39982 100644 --- a/Makefile.init.in +++ b/Makefile.init.in @@ -2,8 +2,6 @@ @SET_MAKE@ -export SHELL=/bin/bash - srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/configure b/configure index 3a896ff166..8899067526 100755 --- a/configure +++ b/configure @@ -2049,9 +2049,12 @@ fi -# rude crude hack alert -- we should do something that actually attempts -# to guess at the usual perl locations, instead of this hard-coded nasty. -PERLINCL="-I/usr/lib/perl5/i386-linux/5.00404/CORE" +# This appears to be what Perl's ExtUtils::MakeMaker module does, so +# I'm reasonably sure it's correct. +# PERLINCL="-I/usr/lib/perl5/i386-linux/5.00404/CORE" +# XXX - However, 'configure' should still find the proper version of Perl. +# +PERLINCL=-I`perl -MConfig -e 'print $Config{"archlibexp"},"/CORE"'` # Check whether --with-perl-includes or --without-perl-includes was given. if test "${with_perl_includes+set}" = set; then withval="$with_perl_includes" @@ -2064,7 +2067,7 @@ fi # the XmHTML widget needs libz, libjpeg, libpng and libm # it also uses #ifdef's not #if's so DONT #def to zero. echo $ac_n "checking for deflateEnd in -lz""... $ac_c" 1>&6 -echo "configure:2068: checking for deflateEnd in -lz" >&5 +echo "configure:2071: checking for deflateEnd in -lz" >&5 ac_lib_var=`echo z'_'deflateEnd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2072,7 +2075,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2107,7 +2110,7 @@ else fi echo $ac_n "checking for jpeg_read_scanlines in -ljpeg""... $ac_c" 1>&6 -echo "configure:2111: checking for jpeg_read_scanlines in -ljpeg" >&5 +echo "configure:2114: checking for jpeg_read_scanlines in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_scanlines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2115,7 +2118,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2150,7 +2153,7 @@ else fi echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:2154: checking for png_read_image in -lpng" >&5 +echo "configure:2157: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2158,7 +2161,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2199,15 +2202,15 @@ fi # LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS $LIBS" echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:2203: checking for XpmReadFileToXpmImage in -lXpm" >&5 +echo "configure:2206: checking for XpmReadFileToXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXpm -L $x_libraries -lX11 $LIBS" +LIBS="-lXpm -L$x_libraries -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2249,7 +2252,7 @@ fi # Don't build the xmhtml source if user already has it installed... # this is ugly, there must be a nicer way of setting this up ... echo $ac_n "checking for XmHTMLTextScrollToLine in -lXmHTML""... $ac_c" 1>&6 -echo "configure:2253: checking for XmHTMLTextScrollToLine in -lXmHTML" >&5 +echo "configure:2256: checking for XmHTMLTextScrollToLine in -lXmHTML" >&5 ac_lib_var=`echo XmHTML'_'XmHTMLTextScrollToLine | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2257,7 +2260,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmHTML $X_PRE_LIBS $MOTIF_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2289,7 +2292,7 @@ else MOTIF_LIBS="-lXmHTML $MOTIF_LIBS" XMHTML_TARGET=default XMHTML_INC=/lib/XmHTML-1.1.0/src - LIBS="-L $srcdir/lib/XmHTML-1.1.0 $LIBS" + LIBS="-L$srcdir/lib/XmHTML-1.1.0 $LIBS" fi @@ -2303,7 +2306,7 @@ fi # If readline exists, just assume that guile needs it. It probably does. echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2307: checking for readline in -lreadline" >&5 +echo "configure:2310: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2311,7 +2314,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2354,21 +2357,21 @@ fi # results, so one failure makes all further attempts fail. echo $ac_n "checking for guile""... $ac_c" 1>&6 -echo "configure:2358: checking for guile" >&5 +echo "configure:2361: checking for guile" >&5 GNC_LIBS_SAFE=${LIBS} GNC_TEST_LIBS="-lguile" LIBS="${GNC_LIBS_HELPER} ${GNC_TEST_LIBS} ${LIBS}" cat > conftest.$ac_ext < int main() { gh_eval_file; ; return 0; } EOF -if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}" else @@ -2383,14 +2386,14 @@ then GNC_TEST_LIBS="-lguile -ldl" LIBS="${GNC_LIBS_HELPER} ${GNC_TEST_LIBS} ${LIBS}" cat > conftest.$ac_ext < int main() { gh_eval_file; ; return 0; } EOF -if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}" else @@ -2406,14 +2409,14 @@ then GNC_TEST_LIBS="-lguile -lqthreads" LIBS="${GNC_LIBS_HELPER} ${GNC_TEST_LIBS} ${LIBS}" cat > conftest.$ac_ext < int main() { gh_eval_file; ; return 0; } EOF -if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}" else @@ -2429,14 +2432,14 @@ then GNC_TEST_LIBS="-lguile -ltermcap" LIBS="${GNC_LIBS_HELPER} ${GNC_TEST_LIBS} ${LIBS}" cat > conftest.$ac_ext < int main() { gh_eval_file; ; return 0; } EOF -if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}" else @@ -2452,14 +2455,14 @@ then GNC_TEST_LIBS="-lguile -lqthreads -ltermcap" LIBS="${GNC_LIBS_HELPER} ${GNC_TEST_LIBS} ${LIBS}" cat > conftest.$ac_ext < int main() { gh_eval_file; ; return 0; } EOF -if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* GUILELIBS="$GUILELIBS ${GNC_TEST_LIBS}" else @@ -2483,7 +2486,7 @@ echo "$ac_t""yes" 1>&6 ### Plotutils echo $ac_n "checking for openpl in -lplot""... $ac_c" 1>&6 -echo "configure:2487: checking for openpl in -lplot" >&5 +echo "configure:2490: checking for openpl in -lplot" >&5 ac_lib_var=`echo plot'_'openpl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2491,7 +2494,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplot $X_PRE_LIBS $MOTIF_LIBS $X_EXTRA_LIBS -lXaw $X_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index 3d1d11ffa5..a1875c1733 100644 --- a/configure.in +++ b/configure.in @@ -118,9 +118,12 @@ AC_ARG_WITH( opt-style-install, OPT_STYLE_INSTALL=0) AC_SUBST(OPT_STYLE_INSTALL) -# rude crude hack alert -- we should do something that actually attempts -# to guess at the usual perl locations, instead of this hard-coded nasty. -PERLINCL="-I/usr/lib/perl5/i386-linux/5.00404/CORE" +# This appears to be what Perl's ExtUtils::MakeMaker module does, so +# I'm reasonably sure it's correct. +# PERLINCL="-I/usr/lib/perl5/i386-linux/5.00404/CORE" +# XXX - However, 'configure' should still find the proper version of Perl. +# +PERLINCL=-I`perl -MConfig -e 'print $Config{"archlibexp"},"/CORE"'` AC_ARG_WITH( perl-includes, [ --with-perl-includes=DIR specify where to look for perl CORE includes], PERLINCL="-I$with_perl_includes -I$with_perl_includes/CORE" ) @@ -143,7 +146,7 @@ AC_CHECK_LIB(png, png_read_image, AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, AC_DEFINE(HAVE_XPM,1) X_LIBS="-lXpm $X_LIBS", - AC_DEFINE(HAVE_XPM,0), -L $x_libraries -lX11) + AC_DEFINE(HAVE_XPM,0), -L$x_libraries -lX11) # Don't build the xmhtml source if user already has it installed... # this is ugly, there must be a nicer way of setting this up ... @@ -152,7 +155,7 @@ AC_CHECK_LIB(XmHTML, XmHTMLTextScrollToLine, MOTIF_LIBS="-lXmHTML $MOTIF_LIBS" XMHTML_TARGET=default XMHTML_INC=/lib/XmHTML-1.1.0/src - LIBS="-L $srcdir/lib/XmHTML-1.1.0 $LIBS" , + LIBS="-L$srcdir/lib/XmHTML-1.1.0 $LIBS" , $X_PRE_LIBS $MOTIF_LIBS $X_EXTRA_LIBS $X_LIBS) AC_SUBST(XMHTML_TARGET)