r15000 - gnucash/branches/swig-redo - Remove last g-wrap occurences in configure.in and the file g-wrap.m4.

[Andreas Köhler]

Author: andi5
Date: 2006-10-10 20:07:19 -0400 (Tue, 10 Oct 2006)
New Revision: 15000
Trac: http://svn.gnucash.org/trac/changeset/15000

Removed:
   gnucash/branches/swig-redo/macros/g-wrap.m4
Modified:
   gnucash/branches/swig-redo/
   gnucash/branches/swig-redo/configure.in
Log:
Remove last g-wrap occurences in configure.in and the file g-wrap.m4.



Property changes on: gnucash/branches/swig-redo
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:767
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971

Modified: gnucash/branches/swig-redo/configure.in
===================================================================
--- gnucash/branches/swig-redo/configure.in	2006-10-11 00:00:47 UTC (rev 14999)
+++ gnucash/branches/swig-redo/configure.in	2006-10-11 00:07:19 UTC (rev 15000)
@@ -480,7 +480,6 @@
 GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
 GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
 GNC_UI_DIR='${GNC_SHAREDIR}/ui'
-GNC_GWRAP_LIBDIR='${GNC_SHAREDIR}/guile-modules/g-wrapped'
 GNC_MODULE_DIR='${pkglibdir}'
 GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps'
 
@@ -489,7 +488,6 @@
 AC_SUBST(GNC_DOC_INSTALL_DIR)
 AC_SUBST(GNC_GLADE_DIR)
 AC_SUBST(GNC_UI_DIR)
-AC_SUBST(GNC_GWRAP_LIBDIR)
 AC_SUBST(GNC_INCLUDE_DIR)
 AC_SUBST(GNC_LIBDIR)
 AC_SUBST(GNC_MODULE_DIR)
@@ -1925,7 +1923,7 @@
 ### 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 -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgncmodule"
 
 GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
 GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"
@@ -1971,9 +1969,6 @@
 if test ${GCC}x = yesx
 then
   warnFLAGS=
-  # These two are because of g-wrap -- it can't avoid unused and uninitialized.
-  #warnFLAGS="${warnFLAGS} -Wno-uninitialized"
-  #warnFLAGS="${warnFLAGS} -Wno-unused"
   CFLAGS="${CFLAGS} -Wno-unused"
   # other flags...
   # These next two are included in the GNOME_COMPILE_WARNINGS

Deleted: gnucash/branches/swig-redo/macros/g-wrap.m4
===================================================================
--- gnucash/branches/swig-redo/macros/g-wrap.m4	2006-10-11 00:00:47 UTC (rev 14999)
+++ gnucash/branches/swig-redo/macros/g-wrap.m4	2006-10-11 00:07:19 UTC (rev 15000)
@@ -1,81 +0,0 @@
-dnl g-wrap.m4
-dnl Written by Robert Merkel <rgmerk at mira.net>
-dnl Parts ripped off from guile.m4 and ORBit.m4
-
-dnl check whether we use the old or new guile smobs
-
-AC_DEFUN([AC_GWRAP_CHECK_GUILE],
-[if test x$GUILE = x ; then
-	AC_PATH_PROG(GUILE, guile, no)
- fi
- dnl AC_MSG_WARN(guile is $GUILE)
- if test "${GUILE}" = "no" ; then
-	AC_MSG_ERROR(g-wrap couldn't find guile.)
- fi
-])
-
-dnl AM_PATH_GWRAP ([MINIMUM-VERSION, [ACTION-IF-FOUND.
-dnl	           [ACTION-IF-NOT-FOUND]]])
-
-dnl tests for minimum version of g-wrap.
-dnl sets G_WRAP_CONFIG and GWRAP_OLD_GUILE_SMOB if needed.
-
-AC_DEFUN([AM_PATH_GWRAP],
-[dnl
-dnl
-dnl
-AC_ARG_WITH(g-wrap-prefix,[  --with-g-wrap-prefix=PFX  Prefix where g-wrap is installed (optional)], 
-    gwrap_prefix="$withval", g_wrap_prefix="")
-
-min_gwrap_version=ifelse([$1], , 0.9.1,$1)
-
-if test x${GUILE} = x ; then
-   AC_PATH_PROG(GUILE, guile, no)
-fi
-
-dnl if prefix set, then set them explicitly
-if test x${gwrap_prefix} != x ; then
-   G_WRAP_CONFIG=${gwrap_prefix}/bin/g-wrap-config
-else
-
-  AC_PATH_PROG(G_WRAP_CONFIG, g-wrap-config, no)
-  if test x${G_WRAP_CONFIG} = xno ; then
-	CHECK_VERSION="no"
-	ifelse([$3], , true , [AC_MSG_WARN(g-wrap-config failed)
-	$3])
-  fi
-fi
-
-if test x$CHECK_VERSION != xno ; then
-AC_MSG_CHECKING(for g-wrap - version >= ${min_gwrap_version})
-
-gwrap_major_version=`${G_WRAP_CONFIG} --version | \
-	sed 's/g-wrap-config \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-gwrap_minor_version=`${G_WRAP_CONFIG} --version | \
-	sed 's/g-wrap-config \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-gwrap_micro_version=`${G_WRAP_CONFIG} --version | \
-	sed 's/g-wrap-config \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-
-major_required=`echo ${min_gwrap_version} |\
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-minor_required=`echo ${min_gwrap_version} |\
-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-micro_required=`echo ${min_gwrap_version} |\
-	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-if ${GUILE} -c "(cond ((> ${gwrap_major_version} ${major_required}) (exit 0))\
-	           ((< ${gwrap_major_version} ${major_required}) (exit 1))\
-                   ((> ${gwrap_minor_version} ${minor_required}) (exit 0))\
-		   ((< ${gwrap_minor_version} ${minor_required}) (exit 1))\
-	           ((< ${gwrap_micro_version} ${micro_required}) (exit 1))\
-		   (else (exit 0)))" ; then
-	AC_MSG_RESULT(yes)
-	ifelse([$2], , true, [$2])
-else
-	AC_MSG_RESULT(no)
-	ifelse([$3], , true , [AC_MSG_WARN(guile check failed)
-	$3])
-fi
-dnl check version
-fi])