mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
859a6da3af
* src/engine/gnc-commodity.c (gnc_commodity_table_remove_non_iso): new func * src/test/test-xml-commodity.c: remove duplicate string_to_integer * src/gnome/dialog-userpass.c: add missing #include * src/register/gnome/Makefile.am: add gnome & glib flags * src/engine/Makefile.am: add glib libs * src/engine/sql/Makefile.am: add glib flags * configure.in: fix includes used to check for sizes * acinclude.m4: fix guppi macro * macros/: update m4 files git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3776 57a11ea4-9604-0410-9ed3-97b8803252fd
129 lines
3.5 KiB
Plaintext
129 lines
3.5 KiB
Plaintext
dnl
|
|
dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
|
|
dnl
|
|
dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
|
|
dnl is not found.
|
|
dnl
|
|
|
|
AC_DEFUN([GNOME_INIT_HOOK],[
|
|
AC_SUBST(GNOME_LIBS)
|
|
AC_SUBST(GNOMEUI_LIBS)
|
|
AC_SUBST(GNOMEGNORBA_LIBS)
|
|
AC_SUBST(GTKXMHTML_LIBS)
|
|
AC_SUBST(ZVT_LIBS)
|
|
AC_SUBST(GNOME_LIBDIR)
|
|
AC_SUBST(GNOME_INCLUDEDIR)
|
|
|
|
AC_ARG_WITH(gnome-includes,
|
|
[ --with-gnome-includes Specify location of GNOME headers],[
|
|
CFLAGS="$CFLAGS -I$withval"
|
|
])
|
|
|
|
AC_ARG_WITH(gnome-libs,
|
|
[ --with-gnome-libs Specify location of GNOME libs],[
|
|
LDFLAGS="$LDFLAGS -L$withval"
|
|
gnome_prefix=$withval
|
|
])
|
|
|
|
AC_ARG_WITH(gnome,
|
|
[ --with-gnome Specify prefix for GNOME files],
|
|
if test x$withval = xyes; then
|
|
want_gnome=yes
|
|
dnl Note that an empty true branch is not
|
|
dnl valid sh syntax.
|
|
ifelse([$1], [], :, [$1])
|
|
else
|
|
if test "x$withval" = xno; then
|
|
want_gnome=no
|
|
else
|
|
want_gnome=yes
|
|
LDFLAGS="$LDFLAGS -L$withval/lib"
|
|
CFLAGS="$CFLAGS -I$withval/include"
|
|
gnome_prefix=$withval/lib
|
|
fi
|
|
fi,
|
|
want_gnome=yes)
|
|
|
|
if test "x$want_gnome" = xyes; then
|
|
|
|
AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
|
|
if test "$GNOME_CONFIG" = "no"; then
|
|
no_gnome_config="yes"
|
|
else
|
|
AC_MSG_CHECKING(if $GNOME_CONFIG works)
|
|
if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
|
|
AC_MSG_RESULT(yes)
|
|
GNOME_GNORBA_HOOK([],$2)
|
|
GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
|
|
GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
|
|
GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
|
|
GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
|
|
ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
|
|
GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gtk gnorba gnomeui`"
|
|
GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gtk gnorba gnomeui`"
|
|
$1
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
no_gnome_config="yes"
|
|
fi
|
|
fi
|
|
|
|
if test x$exec_prefix = xNONE; then
|
|
if test x$prefix = xNONE; then
|
|
gnome_prefix=$ac_default_prefix/lib
|
|
else
|
|
gnome_prefix=$prefix/lib
|
|
fi
|
|
else
|
|
gnome_prefix=`eval echo \`echo $libdir\``
|
|
fi
|
|
|
|
if test "$no_gnome_config" = "yes"; then
|
|
AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
|
|
if test -f $gnome_prefix/gnomeConf.sh; then
|
|
AC_MSG_RESULT(found)
|
|
echo "loading gnome configuration from" \
|
|
"$gnome_prefix/gnomeConf.sh"
|
|
. $gnome_prefix/gnomeConf.sh
|
|
$1
|
|
else
|
|
AC_MSG_RESULT(not found)
|
|
if test x$2 = xfail; then
|
|
AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
if test -n "$3"; then
|
|
n="$3"
|
|
for i in $n; do
|
|
AC_MSG_CHECKING(extra library \"$i\")
|
|
case $i in
|
|
applets)
|
|
AC_SUBST(GNOME_APPLETS_LIBS)
|
|
GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
|
|
AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
|
|
docklets)
|
|
AC_SUBST(GNOME_DOCKLETS_LIBS)
|
|
GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
|
|
AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
|
|
capplet)
|
|
AC_SUBST(GNOME_CAPPLET_LIBS)
|
|
GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
|
|
AC_MSG_RESULT($GNOME_CAPPLET_LIBS);;
|
|
*)
|
|
AC_MSG_RESULT(unknown library)
|
|
esac
|
|
done
|
|
fi
|
|
])
|
|
|
|
dnl
|
|
dnl GNOME_INIT ([additional-inits])
|
|
dnl
|
|
|
|
AC_DEFUN([GNOME_INIT],[
|
|
GNOME_INIT_HOOK([],fail,$1)
|
|
])
|