aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog8
-rw-r--r--macros/gnome.m431
2 files changed, 33 insertions, 6 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 0525463531..01ae071490 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,11 @@
+1999-03-09 Raja R Harinath <harinath@cs.umn.edu>
+
+ * gnome.m4 (GNOME_INIT): Add a new paramater, which is passed to
+ GNOME_INIT_HOOK.
+ (GNOME_INIT_HOOK): New parameter "additional inits". This is a
+ list like "applets capplet", and the corresponding
+ GNOME_APPLETS_LIBS and GNOME_CAPPLETS_LIBS are defined.
+
1998-03-01 Mark Crichton <crichton@gimp.org>
* gnome-objc-checks : Added HAVE_GNOME_OBJC conditional
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index b815c784cc..a901e752fa 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -1,18 +1,16 @@
dnl
-dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag)
+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_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_APPLET_LIBS)
AC_SUBST(GNOME_LIBDIR)
AC_SUBST(GNOME_INCLUDEDIR)
@@ -61,7 +59,6 @@ AC_DEFUN([GNOME_INIT_HOOK],
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_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`"
GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
$1
@@ -97,8 +94,30 @@ AC_DEFUN([GNOME_INIT_HOOK],
fi
fi
fi
+
+ if test -n "$3"; then
+ for i in $3; 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);;
+ 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)
+ GNOME_INIT_HOOK([],fail,$1)
])