2003-01-29 Marcus Brinkmann <[email protected]>

	* bonobo/gpgme.c, bonobo/main.c, bonobo/main.h, bonobo/Makefile,
	bonobo/Makefile.am, bonobo/Makefile.in: Dead files removed.
	* configure.ac: Remove automake conditional BUILD_BONOBO
	(AC_CONFIG_FILES): Remove bonobo/Makefile.
	* Makefile.am (bonobo): Remove variable.
	(SUBDIRS): Remove ${bonobo}.

7 files changed, 9 insertions, 128 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a46d077..5a9e954a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-01-29  Marcus Brinkmann  <[email protected]>
 
+	* bonobo/gpgme.c, bonobo/main.c, bonobo/main.h, bonobo/Makefile,
+	bonobo/Makefile.am, bonobo/Makefile.in: Dead files removed.
+	* configure.ac: Remove automake conditional BUILD_BONOBO
+	(AC_CONFIG_FILES): Remove bonobo/Makefile.
+	* Makefile.am (bonobo): Remove variable.
+	(SUBDIRS): Remove ${bonobo}.
+	
 	* configure.ac: Remove all uses of GNUPG_CHECK_TYPEDEF, for byte,
 	ushort, ulong, u16 and u32.
 	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Remove macro.
diff --git a/Makefile.am b/Makefile.am
index 24da3181..f1f2be79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,12 +27,6 @@ else
 assuan =
 endif
 
-if BUILD_BONOBO
-bonobo = bonobo
-else
-bonobo = 
-endif
-
 if BUILD_COMPLUS
 complus = complus
 else
@@ -45,7 +39,7 @@ else
 tests = 
 endif
 
-SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus}
+SUBDIRS = ${assuan} gpgme ${tests} doc ${complus}
 
 # Fix the version of the spec file and create a file named VERSION 
 # to be used for patch's Prereq: feature.
diff --git a/bonobo/Makefile.am b/bonobo/Makefile.am
deleted file mode 100644
index 27bc13d6..00000000
--- a/bonobo/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001 g10 Code GmbH
-# 
-# This file is part of GPGME.
-# 
-# GPGME is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# GPGME is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = gpgme
-
-INCLUDES = -I$(top_srcdir)/jnlib
-LDADD = -L ../jnlib -ljnlib 
-
-gpgme_SOURCES = main.c main.h
-
-
-
diff --git a/bonobo/gpgme.c b/bonobo/gpgme.c
deleted file mode 100644
index 765de506..00000000
--- a/bonobo/gpgme.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* gpgme - Bonbobo component to access GnuPG
- *	Copyright (C) 2000 Werner Koch (dd9jn)
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
diff --git a/bonobo/main.c b/bonobo/main.c
deleted file mode 100644
index e42d20ad..00000000
--- a/bonobo/main.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* main.c - Bonbobo component to access GnuPG
- *	Copyright (C) 2000 Werner Koch (dd9jn)
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
diff --git a/bonobo/main.h b/bonobo/main.h
deleted file mode 100644
index 41b56df5..00000000
--- a/bonobo/main.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* main.h -  GPGME Bonobo component
- *	Copyright (C) 2000 Werner Koch (dd9jn)
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef MAIN_H
-#define MAIN_H
-
-
-struct {
-    int verbose;
-    int quiet;
-    unsigned int debug;
-    char *homedir;
-} opt;
-
-
-
-
-#endif /* MAIN_H */
-
-
-
-
-
-
-
diff --git a/configure.ac b/configure.ac
index fa9c3eb2..119ec88c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,12 +135,6 @@ AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes")
 AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
 
 dnl
-dnl Checks for libraries.
-dnl
-
-dnl FIXME: check whether Bonobo is installed
-
-dnl
 dnl Checks for header files.
 dnl
 AC_CHECK_HEADERS(sys/select.h)
@@ -246,7 +240,6 @@ dnl FIXME: Only build if supported.
 AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
 
 AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")
-AM_CONDITIONAL(BUILD_BONOBO,  test "$component_system" = "Bonobo")
 
 dnl Make the version number in gpgme/gpgme.h the same as the one here.
 dnl (this is easier than to have a *.in file just for one substitution)
@@ -269,8 +262,7 @@ dnl
 
 AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile
 		tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
-		doc/Makefile
-		bonobo/Makefile complus/Makefile)
+		doc/Makefile complus/Makefile)
 AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config)
 AC_OUTPUT