diff --git a/README b/README index d71ec27e90..7782000804 100644 --- a/README +++ b/README @@ -131,6 +131,20 @@ Building & Installing: These steps does not apply to binary distributions; only to source distributions. +Prior to building GnuCash, you will have to obtain and install the following +packages: + +SWIG -- available at www.swig.org +guile -- need version 1.3 or later ... +Motif or Lesstif -- +XmHTML -- version 1.1.4 or later + http://www.llp.fu-berlin.de/lsoft/F/5/XMHTML.html + http://www.xs4all.nl/~ripley/XmHTML/XmHTML.html +libpng -- portable network graphics library +libjpeg -- JPEG image handling library +libz -- comopression library +xpm -- X Pixmap extension + Normally, to build and install GnuCash, all you have to do is: # ./configure diff --git a/configure b/configure index 7e64024f19..e6e7e4eb46 100755 --- a/configure +++ b/configure @@ -2166,12 +2166,10 @@ EOF fi -# X_LIBS="-lXmHTML $X_LIBS" - # 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:2175: checking for XmHTMLTextScrollToLine in -lXmHTML" >&5 +echo "configure:2173: 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 @@ -2179,7 +2177,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmHTML -lXm -L $x_libraries -lXext -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2192: \"$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 @@ -2221,7 +2219,7 @@ fi # Set GUILELIBS according to the set of libraries needed to link # with guile. echo $ac_n "checking for gh_enter in -lguile""... $ac_c" 1>&6 -echo "configure:2225: checking for gh_enter in -lguile" >&5 +echo "configure:2223: checking for gh_enter in -lguile" >&5 ac_lib_var=`echo guile'_'gh_enter | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2229,7 +2227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lguile $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2242: \"$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 @@ -2259,7 +2257,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gh_define in -lguile""... $ac_c" 1>&6 -echo "configure:2263: checking for gh_define in -lguile" >&5 +echo "configure:2261: checking for gh_define in -lguile" >&5 ac_lib_var=`echo guile'_'gh_define | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2267,7 +2265,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lguile -ldl -lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2280: \"$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 @@ -2297,7 +2295,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gh_eval_file in -lguile""... $ac_c" 1>&6 -echo "configure:2301: checking for gh_eval_file in -lguile" >&5 +echo "configure:2299: checking for gh_eval_file in -lguile" >&5 ac_lib_var=`echo guile'_'gh_eval_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2305,7 +2303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lguile -ldl -lreadline -lqthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2318: \"$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 @@ -2448,7 +2446,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "gnucash Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "gnucash Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile src/reports/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 139af43db8..61e3fe641b 100644 --- a/configure.in +++ b/configure.in @@ -126,6 +126,6 @@ AC_SUBST(GUILELIBS) # ******************************************* AC_CONFIG_HEADER(config.h) -AC_OUTPUT(gnucash Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) +AC_OUTPUT(gnucash Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile src/reports/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) chmod +x gnucash diff --git a/src/Makefile.in b/src/Makefile.in index ad4820cd4a..65cb07afe8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -27,13 +27,13 @@ srcdir = @srcdir@ VPATH = @srcdir@ CC = @CC@ -INCLPATH = -I.. -I./engine -I./register -I@srcdir@/../include -I@prefix@/include +INCLPATH = -I.. -I./engine -I./register -Ireports -I@srcdir@/../include -I@prefix@/include CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH} ###################################################################### # See Makefile.common for information about these variables. -COMMON_SRCS := SplitLedger.c MultiLedger.c +COMMON_SRCS := MultiLedger.c SplitLedger.c CLEAN_SUBDIRS := engine gnome motif register guile swig qt ###################################################################### @@ -48,6 +48,7 @@ default: $(OBJS) motif: ${MOTIF_OBJS} @cd engine; $(MAKE) default @cd register; $(MAKE) motif + @cd reports; $(MAKE) default @cd guile; $(MAKE) path-defaults.h @cd swig; $(MAKE) guile @cd guile; $(MAKE) default @@ -56,15 +57,17 @@ motif: ${MOTIF_OBJS} gnome: ${GNOME_OBJS} @cd engine; $(MAKE) default @cd register; $(MAKE) gnome + @cd reports; $(MAKE) default @cd guile; $(MAKE) path-defaults.h @cd swig; $(MAKE) guile @cd guile; $(MAKE) default @cd gnome; $(MAKE) gnome qt: $(QT_OBJS) - @cd engine; $(MAKE) default - @cd register; $(MAKE) qt - @cd qt; $(MAKE) qt + @cd engine; $(MAKE) default + @cd register; $(MAKE) qt + @cd reports; $(MAKE) default + @cd qt; $(MAKE) qt .PHONY: default qt gnome motif all diff --git a/src/register/Makefile.in b/src/register/Makefile.in index 189c4f7942..cf52b0cf57 100644 --- a/src/register/Makefile.in +++ b/src/register/Makefile.in @@ -64,7 +64,7 @@ gnome: ${GNOME_OBJS} qt: $(QT_OBJS) -.PHONY: all motif gnome +.PHONY: all motif gnome qt # Local Variables: # tab-width: 2