diff options
| -rw-r--r-- | macros/ChangeLog | 12 | ||||
| -rw-r--r-- | macros/Makefile.am | 1 | ||||
| -rw-r--r-- | macros/gnome-gnorba-check.m4 | 31 | ||||
| -rw-r--r-- | macros/gnome.m4 | 7 |
4 files changed, 49 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 99b25919c8..5c6fd85a94 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,15 @@ +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. + 1998-11-12 Raja R Harinath <harinath@cs.umn.edu> * gnome-support.m4 (vsnprintf): Remove easy-vsnprintf hack -- it diff --git a/macros/Makefile.am b/macros/Makefile.am index 6034884d80..712e255671 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -5,6 +5,7 @@ MACROS= \ curses.m4 \ gnome-fileutils.m4 \ gnome-ghttp-check.m4 \ + gnome-gnorba-check.m4 \ gnome-guile-checks.m4 \ gnome-libgtop-check.m4 \ gnome-libgtop-sysdeps.m4 \ diff --git a/macros/gnome-gnorba-check.m4 b/macros/gnome-gnorba-check.m4 new file mode 100644 index 0000000000..bb3d9b7125 --- /dev/null +++ b/macros/gnome-gnorba-check.m4 @@ -0,0 +1,31 @@ +dnl +dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag) +dnl +dnl if failflag is "failure" it aborts if gnorba is not found. +dnl + +AC_DEFUN([GNOME_GNORBA_HOOK],[ + GNOME_ORBIT_HOOK([],$2) + AC_MSG_CHECKING(for gnorba libraries) + GNORBA_CFLAGS= + GNORBA_LIBS= + if test -n "$ORBIT_LIBS"; then + $1 + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + fi + if test -n "$GNORBA_LIBS"; then + AC_SUBST(GNORBA_CFLAGS) + AC_SUBST(GNORBA_LIBS) + AC_MSG_RESULT(yes) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(Could not find gnorba libraries) + fi + AC_MSG_RESULT(no) + fi +]) + +AC_DEFUN([GNOME_GNORBA_CHECK], [ + GNOME_GNORBA_HOOK([],failure) +]) 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) |