summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Crichton <crichton@src.gnome.org>1999-03-01 05:21:53 +0000
committerMark Crichton <crichton@src.gnome.org>1999-03-01 05:21:53 +0000
commitbbdb92e2ff80fdccf459ea14e33532e681764837 (patch)
treed9f2e2e9151837067181c75e2ca5db63e92c6ad3
parent3096482697c773068ae6c8924c3e21fa4366e40b (diff)
downloadgnome-common-bbdb92e2ff80fdccf459ea14e33532e681764837.tar.gz
Ok, this was bugging me.... ....for a while my objc compiler was borked. I
Ok, this was bugging me.... ....for a while my objc compiler was borked. I had it, but it didn't work. gnome-network would abuse and abuse me since it only checked for the objc compiler and not gnome-objc. Noticed we didn't have a HAVE_GNOME_OBJC conditional, so I added it. It works (so far...) Mark Crichton svn path=/trunk/; revision=673
-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 cbeb877..0525463 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 aa7fc58..dc9691c 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)