aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Teichman <teichman@src.gnome.org>1999-08-02 12:57:30 +0800
committerPeter Teichman <teichman@src.gnome.org>1999-08-02 12:57:30 +0800
commitf812a77ab63149367d289b9aea02ca7e813c7058 (patch)
treeb673aa7f1eeac342f54d09c061dfd44ee7255ecb
parent3f3a867c4ca5fae49cac1d151055b1eb75278569 (diff)
downloadgsoc2013-evolution-f812a77ab63149367d289b9aea02ca7e813c7058.tar.gz
gsoc2013-evolution-f812a77ab63149367d289b9aea02ca7e813c7058.tar.zst
gsoc2013-evolution-f812a77ab63149367d289b9aea02ca7e813c7058.zip
merging gnome-conduit-check.m4 removal from the newconduit branch
svn path=/trunk/; revision=1060
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-conduit-check.m450
2 files changed, 5 insertions, 50 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 7f358f81e4..1cd754ed7d 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-02 Peter Teichman <pat4@acpub.duke.edu>
+
+ * removed gnome-conduit-check.m4 - it should be distributed with
+ gnome-pilot
+
1999-07-30 Peter Teichman <pat4@acpub.duke.edu>
* gnome-conduit-check.m4: added new file of checks. anything that
diff --git a/macros/gnome-conduit-check.m4 b/macros/gnome-conduit-check.m4
deleted file mode 100644
index 2cc3655cb5..0000000000
--- a/macros/gnome-conduit-check.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-dnl
-dnl GNOME_CONDUIT_HOOK (script-if-xml-found, failflag)
-dnl
-dnl If failflag is "failure", script aborts due to lack of XML
-dnl
-dnl Check for availability of the Pilot conduit framework
-dnl
-
-AC_DEFUN([CONDUIT_LIBS_CHECK], [
- AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
- if test "$GNOME_CONFIG" = no; then
- if test x$2 = xfailure; then
- AC_MSG_ERROR(Could not find gnome-config)
- fi
- fi
-
- AC_MSG_CHECKING(for Palm conduit libs)
- if gnome-config --libs conduit > /dev/null 2>&1; then
- GNOME_CONDUIT_LIBS=`gnome-config --libs conduit`
- GNOME_CONDUIT_INCLUDEDIR=`gnome-config --cflags conduit`
- HAVE_GNOME_CONDUIT=yes
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- AC_SUBST(HAVE_GNOME_CONDUIT)
- AC_SUBST(GNOME_CONDUIT_LIBS)
- AC_SUBST(GNOME_CONDUIT_INCLUDEDIR)
-])
-
-AC_DEFUN([GNOME_CONDUIT_HOOK], [
- AC_ARG_ENABLE(conduits,
- [ --disable-conduits disable Palm conduits ], [
- if test x$enableval = xno; then
- # do nothing
- true
- else
- # try to find conduit libs. error if not found.
- CONDUIT_LIBS_CHECK
- if test x$HAVE_GNOME_CONDUIT = x; then
- AC_MSG_ERROR(Palm conduit libraries not found)
- fi
- fi ], [
- CONDUIT_LIBS_CHECK ])
-])
-
-AC_DEFUN([GNOME_CONDUIT_CHECK], [
- GNOME_CONDUIT_HOOK([],failure)
-])