r14996 - gnucash/branches/swig-redo - Rip out all g-wrap configure checks; we don't need 'em anymore.
Derek Atkins
warlord at cvs.gnucash.org
Tue Oct 10 17:55:17 EDT 2006
Author: warlord
Date: 2006-10-10 17:55:16 -0400 (Tue, 10 Oct 2006)
New Revision: 14996
Trac: http://svn.gnucash.org/trac/changeset/14996
Modified:
gnucash/branches/swig-redo/configure.in
Log:
Rip out all g-wrap configure checks; we don't need 'em anymore.
Modified: gnucash/branches/swig-redo/configure.in
===================================================================
--- gnucash/branches/swig-redo/configure.in 2006-10-10 18:33:33 UTC (rev 14995)
+++ gnucash/branches/swig-redo/configure.in 2006-10-10 21:55:16 UTC (rev 14996)
@@ -238,20 +238,13 @@
### --------------------------------------------------------------------------
-### Guile and g-wrap version checks (should this be something other than
-### the Gnome check?)
+### Guile version checks (should this be something other than the Gnome check?)
GUILE_LIBS=""
GNOME_CHECK_GUILE
AS_SCRUB_INCLUDE(GUILE_INCS)
AC_SUBST(GUILE_LIBS)
-### --------------------------------------------------------------------------
-### G-wrap (libraries and executable)
-
-G_WRAP_COMPILE_ARGS=""
-G_WRAP_LINK_ARGS=""
-
AM_GUILE_VERSION_CHECK(1.6.0, , , [AC_MSG_ERROR([
guile does not appear to be installed correctly, or is not in the
@@ -271,88 +264,10 @@
AC_DEFINE(HAVE_GUILE18,1,[System has guile 1.8 or better])
], )
-AM_PATH_GWRAP(1.3.3, , [AC_MSG_ERROR([
-
- g-wrap does not appear to be installed correctly, or is not new
- enough. GnuCash requires at least version 1.3.3 to build,
- and 1.9.6 to build cleanly with GCC4. If you need to install g-wrap,
- you can find it at http://www.nongnu.org/g-wrap/ .
-])])
-
-# Find out what the g-wrap compile and link flags are.
-AC_MSG_CHECKING(for g-wrap compile args)
-G_WRAP_COMPILE_ARGS=`${G_WRAP_CONFIG} --c-compile-args guile`
-AC_MSG_RESULT($G_WRAP_COMPILE_ARGS)
-
-AC_MSG_CHECKING(for g-wrap link args)
-G_WRAP_LINK_ARGS=`${G_WRAP_CONFIG} --c-link-args guile`
-# Dear g-wrap: adding -L/usr/lib is very silly. Do not do this.
-G_WRAP_LINK_ARGS=`echo ${G_WRAP_LINK_ARGS} | sed -e 's|-L/usr/lib ||'`
-AC_MSG_RESULT($G_WRAP_LINK_ARGS)
-
-AC_MSG_CHECKING(for g-wrap module directory)
-G_WRAP_MODULE_DIR=`${G_WRAP_CONFIG} --guile-module-directory`
-G_WRAP_LIB_DIR=`echo $G_WRAP_MODULE_DIR | sed -e 's|share/guile.*$|lib|'`
-AC_MSG_RESULT($G_WRAP_MODULE_DIR)
-
-AC_GWRAP_CHECK_GUILE($G_WRAP_MODULE_DIR)
-
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $GUILE_INCS $G_WRAP_COMPILE_ARGS"
-AC_CHECK_HEADER(g-wrap-wct.h,,
- [AC_MSG_ERROR([
-
- cannot find g-wrap-wct.h where g-wrap claims it should be.
- are you on Debian or Ubuntu and still using g-wrap 1.9.6-2?
- See: http://bugzilla.gnome.org/show_bug.cgi?id=330539
-
-])])
-CPPFLAGS=$save_CPPFLAGS
-
-AC_SUBST(G_WRAP_CONFIG)
-AC_SUBST(G_WRAP_COMPILE_ARGS)
-AC_SUBST(G_WRAP_LINK_ARGS)
-AC_SUBST(G_WRAP_MODULE_DIR)
-AC_SUBST(G_WRAP_LIB_DIR)
-
AS_SCRUB_INCLUDE(CFLAGS)
-AC_MSG_CHECKING([for (g-wrap) guile module])
-if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
- GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
- ${GUILE} -c "(use-modules (g-wrap))" > /dev/null 2>&1
-then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([
-
- Cannot find the (g-wrap) guile module.
- Are you sure you have g-wrap compile-time environment installed?
- See http://bugzilla.gnome.org/show_bug.cgi?id=347680
-
-])
-fi
-
-AC_MSG_CHECKING([for (g-wrap gw-glib-spec) guile module])
-if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
- GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
- ${GUILE} -c "(use-modules (g-wrap gw-glib-spec))" > /dev/null 2>&1
-then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([
-
- Cannot find the (g-wrap gw-glib-spec) guile module.
- Are you sure you have g-wrap installed with glib support?
- See http://bugzilla.gnome.org/show_bug.cgi?id=347404
-
-])
-fi
-
AC_MSG_CHECKING([for SLIB support])
-if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
- GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
- ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1
+if ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1
then
AC_MSG_RESULT(yes)
else
@@ -364,31 +279,6 @@
])
fi
-AC_MSG_CHECKING([for (g-wrap gw-standard) guile module])
-if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
- GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
- ${GUILE} -c "(use-modules (g-wrap gw-standard))" > /dev/null 2>&1
-then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for (g-wrap gw standard) guile module])
- if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
- GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
- ${GUILE} -c "(use-modules (g-wrap gw standard))" > /dev/null 2>&1
- then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_WARN([
-
- Unable to find the g-wrap standard module, a.k.a. guile-g-wrap.
- You won't be able to run GnuCash without it!
-
- ])
- fi
-fi
-
### Check size of long_long - some guile's are broken.
AC_MSG_CHECKING(if guile long_long is at least as big as gint64)
GNC_OLDCFLAGS="$CFLAGS"
@@ -2037,7 +1927,7 @@
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 -lgncmodule"
-GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS}"
+GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS}"
GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS} ${GUILE_INCS}"
AC_SUBST(GNUCASH_ENGINE_BASE_LIBS)
@@ -2133,31 +2023,6 @@
warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
# rpmbuild on FC4 forces this flag. Can't hurt to always compile with it.
warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
- if test x$gwrap_major_version = x1 -a "$gwrap_minor_version" -lt 9 ; then
- # This is g-wrap 1.3 + gcc4. Test error-on-warning
- case "$gnc_error_on_warning" in
- auto)
- AC_MSG_ERROR([
-
- Sorry, your current configuration will not compile. You are
- running g-wrap 1.3.x, GCC4, and --enable-error-on-warning, which
- do not work together. You have three options: You can update
- g-wrap to 1.9.6, you can downgrade gcc to GCC3, or you can
- --disable-error-on-warning on the configure line. We recommend
- you update g-wrap to 1.9.6 so gnucash can compile cleanly on GCC4
- You can find it at http://www.nongnu.org/g-wrap/ .
-
-])
- ;;
- yes)
- AC_MSG_WARN([
-
- g-wrap 1.3.x and GCC4 may cause build problems. You have been warned!
-
-])
- ;;
- esac
- fi
fi
fi
fi
More information about the gnucash-changes
mailing list