Changeset 30211 for gs2-extensions/tdb

Timestamp:

2015-09-08T11:49:47+12:00 (9 years ago)

Author:

jmt12

Message:

Extended configuration template with tests for Java, JNI, and TDB (header and library). The last of these depends upon CPPFLAGS and LDFLAGS being passed into the call to configure to correctly find TDB.

File:

• gs2-extensions/tdb/trunk/src/jni/configure.ac (modified) (1 diff)

gs2-extensions/tdb/trunk/src/jni/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ(2.59)
-AC_INIT([txt2tdb], [1.0], [[email protected]])
+AC_INIT([tdbjava], [1.0], [[email protected]])
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
-AC_CONFIG_SRCDIR([txt2tdb.cpp])
+AC_CONFIG_SRCDIR([org_greenstone_tdbjava_TDBJava.c])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+LT_INIT
 
 # Checks for programs.
-AC_PROG_CXX
-AC_PROG_CPP
+AC_PROG_CC
+AC_PROG_JAVAC
+AC_PROG_JAVA
+AX_JNI_INCLUDE_DIR
+for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+do
+  JNI_CFLAGS="$JNI_CFLAGS -I$JNI_INCLUDE_DIR"
+done
+AC_SUBST([JNI_INCLUDE_DIRS], $JNI_CFLAGS)
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_HEADER_STDBOOL
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h])
+AC_CHECK_HEADER([tdb.h], , [AC_MSG_ERROR([Couldn't find tdb.h])])
 
 # Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_LIB([tdb], [tdb_open])
 
 # Checks for library functions.
+AC_CHECK_FUNCS([strerror])
 
 # Completion