mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
* configure.in: switch to check and only install the srfis we
need. do the same for guile-www. (AM_PATH_GWRAP): require g-wrap 1.3.2. (CFLAGS): add -Wno-uninitialized and -Wno-unused to accomodate g-wrap issues. (GNUCASH_ENGINE_LIBS): remove libgw-glib -- now provided by g-wrap. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6538 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
28
configure.in
28
configure.in
@@ -114,10 +114,11 @@ GNOME_CHECK_GUILE
|
||||
G_WRAP_COMPILE_ARGS=""
|
||||
G_WRAP_LINK_ARGS=""
|
||||
|
||||
AM_PATH_GWRAP(1.3.1, , [AC_MSG_ERROR([
|
||||
AM_PATH_GWRAP(1.3.2, , [AC_MSG_ERROR([
|
||||
|
||||
g-wrap does not appear to be installed correctly, or is not new
|
||||
enough. Right now gnucash requires at least version 1.1.12 to build.
|
||||
enough. Right now gnucash requires at least version 1.3.2 to build.
|
||||
as there were major changes between version 1.3.1 and 1.3.2
|
||||
If you need to install g-wrap, you can find it at
|
||||
ftp://ftp.gnucash.org/pub/g-wrap.
|
||||
])])
|
||||
@@ -201,6 +202,22 @@ done
|
||||
|
||||
AC_SUBST(GNC_ADD_ON_SRFIS)
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
### See if we need guile-www
|
||||
|
||||
gnc_have_guile_www=no
|
||||
|
||||
AC_MSG_CHECKING([if guile needs our copy of (guile www)])
|
||||
if ! ${GUILE} -c "(use-modules (www main))" > /dev/null 2>&1
|
||||
then
|
||||
gnc_have_guile_www=yes
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
gnc_have_guile_www=no
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
### Gnome XML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
|
||||
@@ -286,7 +303,10 @@ AC_ARG_ENABLE(error-on-warning,
|
||||
# This has to come after AC_PROG_CC
|
||||
if test ${GCC}x = yesx
|
||||
then
|
||||
CFLAGS="${CFLAGS} -Wunused"
|
||||
# These two are because of g-wrap -- it can't avoid unused and uninitialized.
|
||||
CFLAGS="${CFLAGS} -Wno-unused"
|
||||
CFLAGS="${CFLAGS} -Wno-uninitialized"
|
||||
# other flags...
|
||||
CFLAGS="${CFLAGS} -Wmissing-prototypes"
|
||||
CFLAGS="${CFLAGS} -Wmissing-declarations"
|
||||
CFLAGS="${CFLAGS} -Werror-implicit-function-declaration"
|
||||
@@ -695,7 +715,7 @@ fi
|
||||
### GnuCash flags and libs configuration
|
||||
|
||||
GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
|
||||
GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgw-engine -lgw-kvp -lgw-glib -lgncmodule"
|
||||
GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgw-engine -lgw-kvp -lgncmodule"
|
||||
|
||||
GNUCASH_ENGINE_BASE_CFLAGS="${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS}"
|
||||
GNUCASH_ENGINE_CFLAGS="-I${GNC_INCLUDE_DIR} ${GNUCASH_ENGINE_BASE_CFLAGS} ${GUILE_INCS}"
|
||||
|
||||
Reference in New Issue
Block a user