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

2003-05-09 Christian Stimming <stimming@tuhh.de>

Browse Source 
* macros/openhbci.m4: Fix openhbci macro again so that it uses a C
	check program.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8286 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2003-05-09 21:54:06 +00:00
parent 44f314dfe8
commit c44f4e726e
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-05-09 Christian Stimming <stimming@tuhh.de>
* macros/openhbci.m4: Fix openhbci macro again so that it uses a C
check program.
2003-05-08 Derek Atkins <derek@ihtfp.com> 2003-05-08 Derek Atkins <derek@ihtfp.com>
* configure.in: add AC_PREREQ(2.53) to require 2.53 :) * configure.in: add AC_PREREQ(2.53) to require 2.53 :)

29
macros/openhbci.m4
View File

@ -1,5 +1,5 @@
# Configure paths for OpenHBCI # Configure paths for OpenHBCI
# by Christian Stimming 2002-07-30 # by Christian Stimming 2002-07-30, updated 2003-05-09
# Copied from glib-2.0.m4 by Owen Taylor 1997-2001 # Copied from glib-2.0.m4 by Owen Taylor 1997-2001
dnl AM_PATH_OPENHBCI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_OPENHBCI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@ -44,12 +44,12 @@ AC_MSG_RESULT($hbci_dir)
min_openhbci_version=ifelse([$1], ,0.9.0.0,$1) min_openhbci_version=ifelse([$1], ,0.9.0.0,$1)
AC_MSG_CHECKING(for OpenHBCI - version >= $min_openhbci_version) AC_MSG_CHECKING(for OpenHBCI - version >= $min_openhbci_version)
AC_LANG_PUSH(C++) dnl AC_LANG_PUSH(C++) -- DON'T use C++ here!!!
if test "x$enable_openhbcitest" = "xyes" ; then if test "x$enable_openhbcitest" = "xyes" ; then
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CXXFLAGS="$CXXFLAGS $OPENHBCI_CXXFLAGS" CFLAGS="$CFLAGS $OPENHBCI_CFLAGS"
LIBS="$OPENHBCI_LIBS $LIBS" LIBS="$OPENHBCI_LIBS $LIBS"
dnl dnl
dnl Now check if the installed OpenHBCI is sufficiently new. (Also sanity dnl Now check if the installed OpenHBCI is sufficiently new. (Also sanity
@ -95,13 +95,16 @@ main ()
} }
} }
/* in C: HBCI_Hbci_libraryVersion(&getmajor, &getminor, &getmicro); */
#if ((OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || \ #if ((OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || \
(OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>17))
/* Four-argument libraryVersion_build() was introduced with 0.9.9.18. */
HBCI_Hbci_libraryVersion_build(&getmajor, &getminor, &getmicro, &getbuild);
#elif ((OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || \
(OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>8)) (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>8))
/* Four-argument libraryVersion() was introduced with 0.9.9.9. */ /* Four-argument libraryVersion() was introduced with 0.9.9.9. */
HBCI::Hbci::libraryVersion(getmajor, getminor, getmicro, getbuild); HBCI_Hbci_libraryVersion(&getmajor, &getminor, &getmicro, &getbuild);
#else #else
HBCI::Hbci::libraryVersion(getmajor, getminor, getmicro); HBCI_Hbci_libraryVersion(&getmajor, &getminor, &getmicro);
getbuild = OPENHBCI_VERSION_BUILD; getbuild = OPENHBCI_VERSION_BUILD;
#endif #endif
@ -152,7 +155,7 @@ main ()
return 1; return 1;
} }
],, no_openhbci=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_openhbci=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CXXFLAGS="$ac_save_CXXFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
if test "x$no_openhbci" = x ; then if test "x$no_openhbci" = x ; then
@ -164,9 +167,9 @@ else
: :
else else
echo "*** Could not run OpenHBCI test program, checking why..." echo "*** Could not run OpenHBCI test program, checking why..."
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CXXFLAGS="$CXXFLAGS $OPENHBCI_CXXFLAGS" CFLAGS="$CFLAGS $OPENHBCI_CFLAGS"
LIBS="$LIBS $OPENHBCI_LIBS" LIBS="$LIBS $OPENHBCI_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <openhbci.h> #include <openhbci.h>
@ -186,10 +189,10 @@ else
[ echo "***" [ echo "***"
echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means OpenHBCI is incorrectly installed."]) echo "*** exact error that occured. This usually means OpenHBCI is incorrectly installed."])
CXXFLAGS="$ac_save_CXXFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
OPENHBCI_CXXFLAGS="" OPENHBCI_CFLAGS=""
OPENHBCI_LIBS="" OPENHBCI_LIBS=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
exit 1; exit 1;
@ -197,6 +200,6 @@ fi
AC_SUBST(OPENHBCI_CFLAGS) AC_SUBST(OPENHBCI_CFLAGS)
AC_SUBST(OPENHBCI_LIBS) AC_SUBST(OPENHBCI_LIBS)
AC_SUBST(OPENHBCI_CXXFLAGS) AC_SUBST(OPENHBCI_CXXFLAGS)
AC_LANG_POP(C++) dnl AC_LANG_POP(C++)
rm -f conf.openhbcitest rm -f conf.openhbcitest
]) ])