r15379 - gnucash/trunk - Drop gnucash-config and gnucash.m4.
Andreas Köhler
andi5 at cvs.gnucash.org
Sun Jan 14 14:38:16 EST 2007
Author: andi5
Date: 2007-01-14 14:38:11 -0500 (Sun, 14 Jan 2007)
New Revision: 15379
Trac: http://svn.gnucash.org/trac/changeset/15379
Removed:
gnucash/trunk/gnucash-config.in
gnucash/trunk/gnucash.m4
Modified:
gnucash/trunk/Makefile.am
gnucash/trunk/configure.in
gnucash/trunk/packaging/gnucash.spec.in
gnucash/trunk/packaging/win32/install.sh
Log:
Drop gnucash-config and gnucash.m4.
GnuCashs APIs, ABIs, and libraries are not designed for third-party
development, so do not encourage it at this point of time.
Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/Makefile.am 2007-01-14 19:38:11 UTC (rev 15379)
@@ -24,9 +24,6 @@
README.patches \
README.dependencies
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gnucash.m4
-
# All the other files that go in the distribution tarfile that aren't
# included some other way...
@@ -40,8 +37,6 @@
EXTRA_DIST = \
gnucash.lsm \
- gnucash.m4 \
- gnucash-config.in \
make-gnucash-patch.in \
make-gnucash-potfiles.in \
macros/aqbanking.m4 \
@@ -79,10 +74,6 @@
intltool-update.in \
util/gnc-svnversion
-bin_SCRIPTS = gnucash-config
-
-CLEANFILES = gnucash-config
-
## We borrow guile's convention and use @-...-@ as the substitution
## brackets here, instead of the usual @... at . This prevents autoconf
## from substituting the values directly into the left-hand sides of
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/configure.in 2007-01-14 19:38:11 UTC (rev 15379)
@@ -2242,9 +2242,6 @@
dnl # non-makefiles
dnl # Please read doc/build-system before adding *anything* here
- dnl # we configure gnucash-config here because we *don't*
- dnl # want variables to be fully expanded
- gnucash-config
,
dnl # commands go here, but we don't have any right now
)
Deleted: gnucash/trunk/gnucash-config.in
===================================================================
--- gnucash/trunk/gnucash-config.in 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/gnucash-config.in 2007-01-14 19:38:11 UTC (rev 15379)
@@ -1,214 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
- cat <<EOF
-Usage: gnucash-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--libs]
- [--cflags]
- [--ld-library-path]
- [--scm-module-dir]
-Libraries:
- engine
- network-utils
- app-utils
- register-core
- gnome-utils
- gnucash
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-any_lib=no
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- if test $exec_prefix_set = no ; then
- exec_prefix=$optarg
- fi
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- exec_prefix_set=yes
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --version)
- echo @VERSION@
- exit 0
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- --ld-library-path)
- echo_ld_library_path=yes
- ;;
- --scm-module-dir)
- echo_scm_module_dir=yes
- ;;
- engine)
- lib_engine=yes
- any_lib=yes
- ;;
- app-utils)
- lib_app_utils=yes
- any_lib=yes
- ;;
- network-utils)
- lib_network_utils=yes
- any_lib=yes
- ;;
- gnome-utils)
- lib_gnome_utils=yes
- any_lib=yes
- ;;
- register-core)
- lib_register_core=yes
- any_lib=yes
- ;;
- gnucash)
- lib_gnucash=yes
- any_lib=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-datadir=@datadir@
-libdir=@libdir@
-includedir=@includedir@
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-GNC_LIBDIR=@GNC_LIBDIR@
-GNC_MODULE_DIR=@GNC_MODULE_DIR@
-GNC_SHAREDIR=@GNC_SHAREDIR@
-
-# Trim the link and compile lines down.
-
-if test "$any_lib" = "no"; then
- lib_gnucash=yes
-fi
-
-if test "$lib_app_utils" = "yes"; then
- lib_engine=no
-fi
-
-if test "$lib_register_core" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
- lib_gnome_utils=no
-fi
-
-if test "$lib_gnome_utils" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
-fi
-
-if test "$lib_gnucash" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
- lib_register_core=no
- lib_gnome_utils=no
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes"; then
- cflags=""
-
- if test "$lib_engine" = "yes"; then
- cflags="$cflags @GNUCASH_ENGINE_CFLAGS@"
- fi
-
- if test "$lib_network_utils" = "yes"; then
- cflags="$cflags @GNUCASH_NETWORK_UTILS_CFLAGS@"
- fi
-
- if test "$lib_app_utils" = "yes"; then
- cflags="$cflags @GNUCASH_APP_UTILS_CFLAGS@"
- fi
-
- if test "$lib_register_core" = "yes"; then
- cflags="$cflags @GNUCASH_REGISTER_CORE_CFLAGS@"
- fi
-
- if test "$lib_gnome_utils" = "yes"; then
- cflags="$cflags @GNUCASH_GNOME_UTILS_CFLAGS@"
- fi
-
- echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
- libs="-L${libdir}"
-
- if test "$lib_engine" = "yes"; then
- libs="$libs @GNUCASH_ENGINE_LIBS@"
- fi
-
- if test "$lib_network_utils" = "yes"; then
- libs="$libs @GNUCASH_NETWORK_UTILS_LIBS@"
- fi
-
- if test "$lib_app_utils" = "yes"; then
- libs="$libs @GNUCASH_APP_UTILS_LIBS@"
- fi
-
- if test "$lib_register_core" = "yes"; then
- libs="$libs @GNUCASH_REGISTER_CORE_LIBS@"
- fi
-
- if test "$lib_gnome_utils" = "yes"; then
- libs="$libs @GNUCASH_GNOME_UTILS_LIBS@"
- fi
-
- echo $libs
-fi
-
-if test "$echo_ld_library_path" = "yes"; then
- path="$libdir:$GNC_LIBDIR:$GNC_MODULE_DIR"
- echo $path
-fi
-
-if test "$echo_scm_module_dir" = "yes"; then
- echo $GNC_SHAREDIR/guile-modules
-fi
Deleted: gnucash/trunk/gnucash.m4
===================================================================
--- gnucash/trunk/gnucash.m4 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/gnucash.m4 2007-01-14 19:38:11 UTC (rev 15379)
@@ -1,216 +0,0 @@
-# Configure paths for GnuCash
-# Dave Peticolas <dave at krondo.com> 2001-09-07
-# Based on glib.m4 by Owen Taylor 97-11-3
-
-dnl AM_PATH_GNUCASH([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GnuCash, and define GNUCASH_CFLAGS and GNUCASH_LIBS, if "gmodule" or
-dnl gthread is specified in MODULES, pass to gnucash-config
-dnl
-AC_DEFUN([AM_PATH_GNUCASH],
-[dnl
-dnl Get the cflags and libraries from the gnucash-config script
-dnl
-AC_ARG_WITH(gnucash-prefix,[ --with-gnucash-prefix=PFX Prefix where GnuCash is installed (optional)],
- gnucash_config_prefix="$withval", gnucash_config_prefix="")
-AC_ARG_WITH(gnucash-exec-prefix,[ --with-gnucash-exec-prefix=PFX Exec prefix where GnuCash is installed (optional)],
- gnucash_config_exec_prefix="$withval", gnucash_config_exec_prefix="")
-AC_ARG_ENABLE(gnucashtest, [ --disable-gnucashtest Do not try to compile and run a test GnuCash program],
- , enable_gnucashtest=yes)
-
- if test x$gnucash_config_exec_prefix != x ; then
- gnucash_config_args="$gnucash_config_args --exec-prefix=$gnucash_config_exec_prefix"
- if test x${GNUCASH_CONFIG+set} != xset ; then
- GNUCASH_CONFIG=$gnucash_config_exec_prefix/bin/gnucash-config
- fi
- if test x${GNUCASH_ENV+set} != xset ; then
- GNUCASH_ENV=$gnucash_config_exec_prefix/bin/gnucash-env
- fi
- if test x${GNC_TEST_ENV+set} != xset ; then
- GNC_TEST__ENV=$gnucash_config_exec_prefix/bin/gnc-test-env
- fi
- fi
- if test x$gnucash_config_prefix != x ; then
- gnucash_config_args="$gnucash_config_args --prefix=$gnucash_config_prefix"
- if test x${GNUCASH_CONFIG+set} != xset ; then
- GNUCASH_CONFIG=$gnucash_config_prefix/bin/gnucash-config
- fi
- if test x${GNUCASH_ENV+set} != xset ; then
- GNUCASH_ENV=$gnucash_config_prefix/bin/gnucash-env
- fi
- if test x${GNC_TEST_ENV+set} != xset ; then
- GNC_TEST__ENV=$gnucash_config_prefix/bin/gnc-test-env
- fi
- fi
-
- if test "x$4" = "x"; then
- gnucash_config_args="$gnucash_config_args gnucash"
- else
- gnucash_config_args="$gnucash_config_args $4"
- fi
-
- AC_PATH_PROG(GNUCASH_CONFIG, gnucash-config, no)
- min_gnucash_version=ifelse([$1], ,1.7.0,$1)
- AC_MSG_CHECKING(for GnuCash - version >= $min_gnucash_version)
- no_gnucash=""
- if test "$GNUCASH_CONFIG" = "no" ; then
- no_gnucash=yes
- else
- GNUCASH_CFLAGS=`$GNUCASH_CONFIG $gnucash_config_args --cflags`
- GNUCASH_LIBS=`$GNUCASH_CONFIG $gnucash_config_args --libs`
- gnucash_config_major_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gnucash_config_minor_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gnucash_config_micro_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gnucashtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
- LIBS="$GNUCASH_LIBS $LIBS"
-dnl
-dnl Now check if the installed GNUCASH is sufficiently new. (Also sanity
-dnl checks the results of gnucash-config to some extent
-dnl
- rm -f conf.gnucashtest
- OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
- NEW_LD_PATH=`$GNUCASH_CONFIG $gnucash_config_args --ld-library-path`
- if test "$NEW_LD_PATH"x != x; then
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$NEW_LD_PATH"
- fi
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gnc-engine.h>
-#include <Group.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gnucashtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gnucash_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gnucash_version");
- exit(1);
- }
-
- if ((gnucash_major_version() != $gnucash_config_major_version) ||
- (gnucash_minor_version() != $gnucash_config_minor_version) ||
- (gnucash_micro_version() != $gnucash_config_micro_version))
- {
- printf("\n*** 'gnucash-config --version' returned %d.%d.%d, but GnuCash (%d.%d.%d)\n",
- $gnucash_config_major_version, $gnucash_config_minor_version, $gnucash_config_micro_version,
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- printf ("*** was found! If gnucash-config was correct, then it is best\n");
- printf ("*** to remove the old version of GnuCash. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If gnucash-config was wrong, set the environment variable GNUCASH_CONFIG\n");
- printf("*** to point to the correct copy of gnucash-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
-/* The code below needs GNUCASH_*_VERSION defined in gnc-engine.h
- else if ((gnucash_major_version() != GNUCASH_MAJOR_VERSION) ||
- (gnucash_minor_version() != GNUCASH_MINOR_VERSION) ||
- (gnucash_micro_version() != GNUCASH_MICRO_VERSION))
- {
- printf("*** GnuCash header files (version %d.%d.%d) do not match\n",
- GNUCASH_MAJOR_VERSION, GNUCASH_MINOR_VERSION, GNUCASH_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- }
-*/
- else
- {
- if ((gnucash_major_version() > major) ||
- ((gnucash_major_version() == major) && (gnucash_minor_version() > minor)) ||
- ((gnucash_major_version() == major) && (gnucash_minor_version() == minor) && (gnucash_micro_version() >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GnuCash (%d.%d.%d) was found.\n",
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- printf("*** You need a version of GnuCash newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GnuCash is always available from ftp://ftp.gnucash.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gnucash-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GnuCash, but you can also set the GNUCASH_CONFIG environment to point to the\n");
- printf("*** correct copy of gnucash-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gnucash=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gnucash" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GNUCASH_CONFIG" = "no" ; then
- echo "*** The gnucash-config script installed by GnuCash could not be found"
- echo "*** If GnuCash was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GNUCASH_CONFIG environment variable to the"
- echo "*** full path to gnucash-config."
- else
- if test -f conf.gnucashtest ; then
- :
- else
- echo "*** Could not run GnuCash test program, checking why..."
- CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
- LIBS="$LIBS $GNUCASH_LIBS"
- AC_TRY_LINK([
-#include <gnc-engine.h>
-#include <stdio.h>
-], [ return ((gnucash_major_version()) || (gnucash_minor_version()) || (gnucash_micro_version())); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GnuCash or finding the wrong"
- echo "*** version of GnuCash. If it is not finding GnuCash, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GnuCash was incorrectly installed"
- echo "*** or that you have moved GnuCash since it was installed. In the latter case, you"
- echo "*** may want to edit the gnucash-config script: $GNUCASH_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GNUCASH_CFLAGS=""
- GNUCASH_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GNUCASH_CFLAGS)
- AC_SUBST(GNUCASH_LIBS)
- rm -f conf.gnucashtest
-
- AC_PATH_PROG(GNUCASH_ENV, gnucash-env, gnucash-env)
- AC_SUBST(GNUCASH_ENV)
- AC_PATH_PROG(GNC_TEST_ENV, gnc-test-env, gnc-test-env)
- AC_SUBST(GNC_TEST_ENV)
-
- if test "$NEW_LD_PATH"x != x; then
- export LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH"
- fi
-])
Modified: gnucash/trunk/packaging/gnucash.spec.in
===================================================================
--- gnucash/trunk/packaging/gnucash.spec.in 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/packaging/gnucash.spec.in 2007-01-14 19:38:11 UTC (rev 15379)
@@ -206,7 +206,6 @@
%files devel
%defattr(444,root,root,755)
%{_includedir}/gnucash
-%{_datadir}/aclocal/gnucash.m4
%if %{_with_ofx}
%files ofx
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-01-14 19:38:05 UTC (rev 15378)
+++ gnucash/trunk/packaging/win32/install.sh 2007-01-14 19:38:11 UTC (rev 15379)
@@ -37,7 +37,7 @@
level1=$(basename ${_REPOS_UDIR})
level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
for mydir in $level0 $level1 $level2; do
- if [ -f $mydir/gnucash.m4 ]; then
+ if [ -f $mydir/make-gnucash-patch.in ]; then
die "Do not save install.sh in the repository or one its parent directories"
fi
done
More information about the gnucash-changes
mailing list