[sword-svn] r2950 - in trunk/bindings: . corba

[scribe at crosswire.org]

Author: scribe
Date: 2013-08-05 07:07:42 -0700 (Mon, 05 Aug 2013)
New Revision: 2950

Removed:
   trunk/bindings/Makefile.am
   trunk/bindings/autogen.sh
   trunk/bindings/configure.ac
   trunk/bindings/corba/Makefile.am
Log:
removed dead autotools files


Deleted: trunk/bindings/Makefile.am
===================================================================
--- trunk/bindings/Makefile.am	2013-08-03 23:24:49 UTC (rev 2949)
+++ trunk/bindings/Makefile.am	2013-08-05 14:07:42 UTC (rev 2950)
@@ -1,7 +0,0 @@
-if CORBA
-corbadir = corba
-else
-corbadir =
-endif
-
-SUBDIRS = $(corbadir)

Deleted: trunk/bindings/autogen.sh
===================================================================
--- trunk/bindings/autogen.sh	2013-08-03 23:24:49 UTC (rev 2949)
+++ trunk/bindings/autogen.sh	2013-08-05 14:07:42 UTC (rev 2950)
@@ -1,23 +0,0 @@
-#!/bin/sh
-echo "*** Sword build system generation"
-#echo "*** Recreating libtool"
-#if test -z "$LTIZE"; then
-#LTIZE="$AUTODIR""libtoolize"
-#fi
-#echo "$LTIZE"
-#	$LTIZE --force --copy;
-
-ACLOCAL="$AUTODIR""aclocal"
-echo "*** Recreating aclocal.m4"
-echo "$ACLOCAL"
-	$ACLOCAL -I m4;
-
-echo "*** Recreating configure"
-AUTOCONF="$AUTODIR""autoconf"
-#AUTOHEAD="$AUTODIR""autoheader"
-#	$AUTOHEAD ;
-	$AUTOCONF;
-	
-echo "*** Recreating the Makefile.in files"
-AUTOMAKE="$AUTODIR""automake"
-	$AUTOMAKE -a -c --foreign;

Deleted: trunk/bindings/configure.ac
===================================================================
--- trunk/bindings/configure.ac	2013-08-03 23:24:49 UTC (rev 2949)
+++ trunk/bindings/configure.ac	2013-08-05 14:07:42 UTC (rev 2950)
@@ -1,127 +0,0 @@
-# ---------------------------------------------------------------------
-# Initialisation
-# ---------------------------------------------------------------------
-
-# Version change: Change line 8 only !
-# Change it immediately after a release
-
-AC_INIT(swordbindings, 1.6.1, sword-bugs at crosswire.org)
-AC_CONFIG_SRCDIR([flatapi.cpp])
-AC_PREREQ(2.52)
-AC_REVISION($Revision$)
-
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
-
-#AM_CONFIG_HEADER(include/config.h)
-
-
-# ---------------------------------------------------------------------
-# Check Programs
-# ---------------------------------------------------------------------
-AC_LANG(C++)
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-AC_C_BIGENDIAN
-
-# ---------------------------------------------------------------------
-# Java
-# ---------------------------------------------------------------------
-AC_CHECK_CLASSPATH
-AC_PROG_JAVAC
-AC_PROG_JAVA
-AC_PROG_JAR
-
-# ---------------------------------------------------------------------
-# With options
-# ---------------------------------------------------------------------
-AC_ARG_WITH(tomcathome,
-	AC_HELP_STRING([--with-tomcathome],
-    [tomcat home directory (default=[/usr/local/tomcat])]),,
-    with_tomcathome=[/usr/local/tomcat])
-
-
-# ---------------------------------------------------------------------
-# Enable options
-# ---------------------------------------------------------------------
-AC_ARG_ENABLE(corba,
-	AC_HELP_STRING([--enable-corba],[build swordorbserver (default=no)]),,enable_corba=no)
-
-AM_MAINTAINER_MODE
-
-# ---------------------------------------------------------------------
-# Check libraries
-# ---------------------------------------------------------------------
-
-# ---------------------------------------------------------------------
-# Find pkg-config
-# ---------------------------------------------------------------------
-use_pkgconfig=yes
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test x$PKG_CONFIG = xno ; then
-  AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
-  AC_MSG_ERROR([not using pkg-config])
-  use_pkgconfig=no
-fi
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
-  :
-else
-  AC_MSG_WARN([*** pkg-config too old; version 0.14 or better required.])
-  AC_MSG_ERROR([not using pkg-config])
-  use_pkgconfig=no
-fi
-
-# ---------------------------------------------------------------------
-# Find sword
-# ---------------------------------------------------------------------
-SWORD_CFLAGS=
-SWORD_LIBS=
-if test x$use_pkgconfig = xyes ; then
-  SWORD_LIBS=`$PKG_CONFIG --libs sword`
-  SWORD_CFLAGS=`$PKG_CONFIG --cflags sword`
-fi
-
-# ---------------------------------------------------------------------
-# Tomcat install directories
-# ---------------------------------------------------------------------
-TOMCAT_HOME=$with_tomcathome
-
-# ---------------------------------------------------------------------
-# Find orbit-config
-# ---------------------------------------------------------------------
-ORBIT_LIBS=
-ORBIT_CFLAGS=
-if test x$enable_corba = xyes ; then
-  if test x$use_pkgconfig = xyes ; then
-    ORBIT_LIBS+=`$PKG_CONFIG --libs ORBit-2.0-cpp`
-    ORBIT_CFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0`
-    ORBIT_CXXFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0-cpp`
-  fi
-fi
-
-# ---------------------------------------------------------------------
-# Substitute variables into makefiles
-# ---------------------------------------------------------------------
-AC_SUBST(SWORD_LIBS)
-AC_SUBST(SWORD_CFLAGS)
-AC_SUBST(ORBIT_LIBS)
-AC_SUBST(ORBIT_CFLAGS)
-AC_SUBST(ORBIT_CXXFLAGS)
-AC_SUBST(TOMCAT_HOME)
-
-# ---------------------------------------------------------------------
-# Conditional variables
-# ---------------------------------------------------------------------
-AM_CONDITIONAL(CORBA, test x$enable_corba = xyes)
-
-# ---------------------------------------------------------------------
-# Final output
-# ---------------------------------------------------------------------
-AC_CONFIG_FILES(Makefile corba/Makefile corba/orbitcpp/Makefile corba/java/Makefile)
-AC_OUTPUT
-

Deleted: trunk/bindings/corba/Makefile.am
===================================================================
--- trunk/bindings/corba/Makefile.am	2013-08-03 23:24:49 UTC (rev 2949)
+++ trunk/bindings/corba/Makefile.am	2013-08-05 14:07:42 UTC (rev 2950)
@@ -1,3 +0,0 @@
-EXTRA_DIST = swordorb.idl
-
-SUBDIRS = orbitcpp omniorbcpp java