aboutsummaryrefslogtreecommitdiffstats
path: root/macros/gnome.m4
diff options
context:
space:
mode:
authorAndrew T. Veliath <andrewv@usa.net>1998-11-13 07:58:59 +0800
committerAndrew T. Veliath <andrewtv@src.gnome.org>1998-11-13 07:58:59 +0800
commit3c70d2ff66fcf5aa7f18deb4b19a9cf4aaf78937 (patch)
treefaa4db9d494df142696ecb0666c33aa71a83cc16 /macros/gnome.m4
parent317f6a9bccdbd0e75ad645dc0ee0731b5f96cbd8 (diff)
downloadgsoc2013-evolution-3c70d2ff66fcf5aa7f18deb4b19a9cf4aaf78937.tar.gz
gsoc2013-evolution-3c70d2ff66fcf5aa7f18deb4b19a9cf4aaf78937.tar.zst
gsoc2013-evolution-3c70d2ff66fcf5aa7f18deb4b19a9cf4aaf78937.zip
Add GNOME_GNORBA_CHECK if gnome-config is found. New GNOMEGNORBA_LIBS
1998-11-12 Andrew T. Veliath <andrewv@usa.net> * gnome.m4: (GNOME_INIT_HOOK): Add GNOME_GNORBA_CHECK if gnome-config is found. New GNOMEGNORBA_LIBS library variable (GNOMEGNORBA_LIBS is a superset of GNOMEUI_LIBS). Update GNOME_LIBDIR and GNOME_INCLUDEDIR to to include the required Gnorba info, if it is in a different location. * Makefile.am (MACROS): Add gnome-gnorba-check.m4 to Makefile. * gnome-gnorba-check.m4: New file. svn path=/trunk/; revision=470
Diffstat (limited to 'macros/gnome.m4')
-rw-r--r--macros/gnome.m47
1 files changed, 5 insertions, 2 deletions
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index bec690f397..6c9f90d8e1 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -9,6 +9,7 @@ AC_DEFUN([GNOME_INIT_HOOK],
[
AC_SUBST(GNOME_LIBS)
AC_SUBST(GNOMEUI_LIBS)
+ AC_SUBST(GNOMEGNORBA_LIBS)
AC_SUBST(GTKXMHTML_LIBS)
AC_SUBST(GNOME_LIBDIR)
AC_SUBST(GNOME_INCLUDEDIR)
@@ -20,11 +21,13 @@ AC_DEFUN([GNOME_INIT_HOOK],
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_CHECK
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`"
- GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnomeui`"
- GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnomeui`"
+ GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
+ GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
$1
else
AC_MSG_RESULT(no)