aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog4
-rw-r--r--macros/gnome-objc-checks.m47
2 files changed, 11 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index cbeb877758..0525463531 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+1998-03-01 Mark Crichton <crichton@gimp.org>
+
+ * gnome-objc-checks : Added HAVE_GNOME_OBJC conditional
+
1998-02-27 Gregory McLean <gregm@comstar.net>
* gnome-x-checks.m4 : Require at least gtk+ 1.2 (pointless getting
diff --git a/macros/gnome-objc-checks.m4 b/macros/gnome-objc-checks.m4
index aa7fc580e5..dc9691cf20 100644
--- a/macros/gnome-objc-checks.m4
+++ b/macros/gnome-objc-checks.m4
@@ -62,10 +62,17 @@ AC_DEFUN([GNOME_INIT_OBJC],
if test -f $my_gnome_libdir/obGnomeConf.sh; then
. $my_gnome_libdir/obGnomeConf.sh
AC_MSG_RESULT(found $my_gnome_libdir)
+ ac_cv_have_gnome_objc=yes
else
AC_MSG_RESULT(not found)
AC_MSG_WARN(Could not find the obGnomeConf.sh file that is generated by gnome-objc install)
+ ac_cv_have_gnome_objc=no
fi
+
+ dnl Add a conditional on whether or not we have gnome-objc
+ AM_CONDITIONAL(HAVE_GNOME_OBJC, test x$ac_cv_have_gnome_objc = xyes)
+ HAVE_GNOME_OBJC=$ac_cv_have_gnome_objc
+
AC_SUBST(OBGNOME_INCLUDEDIR)
AC_SUBST(OBGNOME_LIBS)
AC_SUBST(OBGTK_LIBS)