IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add gnucash autoconf macro. Don't include config.h in headers.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5338 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas
2001-09-07 21:51:13 +00:00
parent 2593ecc806
commit d7d84c58e9
35 changed files with 241 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -16,6 +16,9 @@ doc_DATA = \
README \
README.patches
m4datadir = $(datadir)/aclocal
m4data_DATA = gnucash.m4
# All the other files that go in the distribution tarfile that aren't
# included some other way...

2
configure.in
View File

@@ -635,7 +635,7 @@ CFLAGS="$GNC_OLDCFLAGS"
### GnuCash flags and libs configuration
GNUCASH_ENGINE_BASE_LIBS="${GUILE_LIBS} ${GLIB_LIBS}"
GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} libgncmod-engine.la libgw-engine.la libgw-glib.la"
GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} -lgncmod-engine -lgw-engine -lgncmodule -lgw-glib"
GNUCASH_ENGINE_BASE_CFLAGS="${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}"
GNUCASH_ENGINE_CFLAGS="-I${GNC_INCLUDE_DIR} ${GNUCASH_ENGINE_BASE_CFLAGS}"

10
gnucash-config.in
View File

@@ -25,6 +25,8 @@ 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]*=//'` ;;
@@ -60,10 +62,11 @@ while test $# -gt 0; do
;;
engine)
lib_engine=yes
any_lib=yes
;;
gnucash)
lib_engine=yes
lib_gnucash=yes
any_lib=yes
;;
*)
usage 1 1>&2
@@ -72,6 +75,11 @@ while test $# -gt 0; do
shift
done
if test "$any_lib" = "no"; then
lib_gnucash=yes
fi
if test "$echo_prefix" = "yes"; then
echo $prefix
fi

196
gnucash.m4 Normal file
View File

@@ -0,0 +1,196 @@
# Configure paths for GnuCash
# Dave Peticolas <dave@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 GgnuCash 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
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
fi
for module in . $4
do
case "$module" in
engine)
gnucash_config_args="$gnucash_config_args engine"
;;
gnucash)
gnucash_config_args="$gnucash_config_args gnucash"
;;
esac
done
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
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, &micro) != 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 <gnucash.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
])

3
src/app-utils/global-options.h
View File

@@ -23,11 +23,8 @@
#ifndef GLOBAL_OPTIONS_H
#define GLOBAL_OPTIONS_H
#include "config.h"
#include <glib.h>
#include "gnc-common.h"
#include "option-util.h"

2
src/app-utils/gnc-euro.c
View File

@@ -19,6 +19,8 @@
* *
\********************************************************************/
#include "config.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>

1
src/app-utils/gnc-ui-util.c
View File

@@ -34,7 +34,6 @@
#include "global-options.h"
#include "gnc-book.h"
#include "gnc-common.h"
#include "gnc-component-manager.h"
#include "gnc-engine-util.h"
#include "gnc-engine.h"

3
src/app-utils/option-util.h
View File

@@ -24,12 +24,9 @@
#ifndef OPTION_UTIL_H
#define OPTION_UTIL_H
#include "config.h"
#include <guile/gh.h>
#include <glib.h>
#include "gnc-common.h"
#include "gnc-commodity.h"
#include "gnc-ui-common.h"
#include "date.h"

2
src/backend/file/io-gncxml-gen.c
View File

@@ -22,6 +22,8 @@
* *
\********************************************************************/
#include "config.h"
#include "io-gncxml-gen.h"
gboolean

2
src/backend/file/io-gncxml-v2.c
View File

@@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#include "config.h"
#include <glib.h>
#include <stdio.h>
#include <string.h>

2
src/backend/file/io-utils.c
View File

@@ -22,6 +22,8 @@
* *
\********************************************************************/
#include "config.h"
#include <stdio.h>
#include <glib.h>

2
src/backend/file/sixtp-stack.c
View File

@@ -21,6 +21,8 @@
* *
********************************************************************/
#include "config.h"
#include "sixtp.h"
#include "sixtp-stack.h"

2
src/backend/file/sixtp-to-dom-parser.c
View File

@@ -21,6 +21,8 @@
* *
********************************************************************/
#include "config.h"
#include <glib.h>
#include <ctype.h>

2
src/engine/Account.h
View File

@@ -25,8 +25,6 @@
#ifndef XACC_ACCOUNT_H
#define XACC_ACCOUNT_H
#include "config.h"
#include "GNCId.h"
#include "Transaction.h"
#include "kvp_frame.h"

2
src/engine/Backend.c
View File

@@ -21,6 +21,8 @@
* *
\********************************************************************/
#include "config.h"
#include <glib.h>
#include "Account.h"

2
src/engine/Group.c
View File

@@ -25,6 +25,7 @@
#include "config.h"
#include <assert.h>
#include <glib.h>
#include <string.h>
#include "Account.h"
@@ -34,7 +35,6 @@
#include "Group.h"
#include "GroupP.h"
#include "TransactionP.h"
#include "gnc-common.h"
#include "gnc-engine-util.h"
#include "gnc-event-p.h"
#include "gnc-numeric.h"

3
src/engine/Group.h
View File

@@ -25,13 +25,10 @@
#ifndef XACC_ACCOUNT_GROUP_H
#define XACC_ACCOUNT_GROUP_H
#include "config.h"
#include <glib.h>
#include "Account.h"
#include "GNCId.h"
#include "gnc-common.h"
/** PROTOTYPES ******************************************************/

1
src/engine/Makefile.am
View File

@@ -56,7 +56,6 @@ gncinclude_HEADERS = \
gnc-associate-account.h \
gnc-book.h \
gnc-commodity.h \
gnc-common.h \
gnc-engine-util.h \
gnc-engine.h \
gnc-event.h \

3
src/engine/Query.c
View File

@@ -20,6 +20,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#include "config.h"
#include <ctype.h>
#include <glib.h>
#include <math.h>
@@ -32,7 +34,6 @@
#include <assert.h>
#include "gnc-common.h"
#include "gnc-engine-util.h"
#include "gnc-numeric.h"
#include "Account.h"

1
src/engine/Query.h
View File

@@ -28,7 +28,6 @@
#include <glib.h>
#include <regex.h>
#include "gnc-common.h"
#include "Account.h"
#include "Transaction.h"

3
src/engine/Transaction.h
View File

@@ -25,11 +25,8 @@
#ifndef XACC_TRANSACTION_H
#define XACC_TRANSACTION_H
#include "config.h"
#include <time.h>
#include "gnc-common.h"
#include "gnc-commodity.h"
#include "gnc-numeric.h"
#include "kvp_frame.h"

31
src/engine/gnc-common.h
View File

@@ -1,31 +0,0 @@
/********************************************************************\
* gnc-common.h -- define platform independent items *
* *
* Copyright (C) 1999, 2000 Rob Browning *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
* *
\********************************************************************/
#ifndef GNC_COMMON_H
#define GNC_COMMON_H
#include "config.h"
#include <glib.h>
#endif

1
src/engine/gnc-engine-util.c
View File

@@ -37,7 +37,6 @@
#include <sys/time.h>
#include "gnc-engine-util.h"
#include "gnc-common.h"
#include "gnc-engine.h"
/** GLOBALS *********************************************************/

5
src/engine/gnc-engine-util.h
View File

@@ -27,10 +27,6 @@
#ifndef GNC_ENGINE_UTIL_H
#define GNC_ENGINE_UTIL_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <assert.h>
#include <errno.h>
#include <glib.h>
@@ -38,7 +34,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "gnc-common.h"
#include "gnc-commodity.h"
#include "gnc-numeric.h"

2
src/engine/gnc-numeric.c
View File

@@ -23,6 +23,8 @@
#define _GNU_SOURCE
#include "config.h"
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>

7
src/engine/messages.c
View File

@@ -17,9 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
\********************************************************************/
#include "messages.h"
#include <string.h>
#include "config.h"
#include <glib.h>
#include <string.h>
#include "messages.h"
/* Prefix marker and end-of-prefix marker for i18n messages with
qualifying prefix, see

2
src/register/ledger-core/gnc-ledger-display.h
View File

@@ -25,8 +25,6 @@
#ifndef GNC_LEDGER_DISPLAY_H
#define GNC_LEDGER_DISPLAY_H
#include "config.h"
#include <glib.h>
#include "Account.h"

1
src/register/ledger-core/split-register.h
View File

@@ -28,7 +28,6 @@
#include "Group.h"
#include "Transaction.h"
#include "gnc-common.h"
#include "table-allgui.h"

1
src/register/register-core/combocell.h
View File

@@ -50,7 +50,6 @@
#include <glib.h>
#include "basiccell.h"
#include "gnc-common.h"
typedef struct _ComboCell

2
src/register/register-core/numcell.c
View File

@@ -31,6 +31,8 @@
* Copyright (C) 2000 Dave Peticolas <peticola@cs.ucdavis.edu>
*/
#include "config.h"
#include <limits.h>
#include <stdlib.h>
#include <string.h>

4
src/register/register-core/pricecell.c
View File

@@ -35,11 +35,11 @@
#include "config.h"
#include <ctype.h>
#include <string.h>
#include <glib.h>
#include <locale.h>
#include <string.h>
#include <string.h>
#include "gnc-common.h"
#include "gnc-exp-parser.h"
#include "gnc-engine-util.h"
#include "gnc-numeric.h"

1
src/register/register-core/pricecell.h
View File

@@ -45,7 +45,6 @@
#define PRICE_CELL_H
#include "basiccell.h"
#include "gnc-common.h"
#include "gnc-numeric.h"
#include "gnc-ui-util.h"

1
src/register/register-core/table-allgui.h
View File

@@ -93,7 +93,6 @@
#include "basiccell.h"
#include "cellblock.h"
#include "gnc-common.h"
#include "gtable.h"
#include "register-common.h"
#include "table-control.h"

2
src/register/register-gnome/gnucash-date-picker.c
View File

@@ -24,6 +24,8 @@
* A popup date picker for the canvas using gtk_calendar.
*/
#include "config.h"
#include <gnome.h>
#include "gnucash-date-picker.h"

2
src/register/register-gnome/gnucash-item-list.c
View File

@@ -24,6 +24,8 @@
* A scrollable list box.
*/
#include "config.h"
#include <gnome.h>
#include "gnc-engine-util.h"