Changeset 30211 for gs2-extensions

Show
Ignore:
Timestamp:
08.09.2015 11:49:47 (4 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/tdb/trunk/src/jni/configure.ac

    r30193 r30211  
    33 
    44AC_PREREQ(2.59) 
    5 AC_INIT([txt2tdb], [1.0], [jmt12@cs.waikato.ac.nz]) 
     5AC_INIT([tdbjava], [1.0], [jmt12@cs.waikato.ac.nz]) 
    66AM_INIT_AUTOMAKE 
    77AC_CANONICAL_HOST 
    8 AC_CONFIG_SRCDIR([txt2tdb.cpp]) 
     8AC_CONFIG_SRCDIR([org_greenstone_tdbjava_TDBJava.c]) 
    99AC_CONFIG_HEADER([config.h]) 
     10AC_CONFIG_MACRO_DIR([m4]) 
     11LT_INIT 
    1012 
    1113# Checks for programs. 
    12 AC_PROG_CXX 
    13 AC_PROG_CPP 
     14AC_PROG_CC 
     15AC_PROG_JAVAC 
     16AC_PROG_JAVA 
     17AX_JNI_INCLUDE_DIR 
     18for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS 
     19do 
     20  JNI_CFLAGS="$JNI_CFLAGS -I$JNI_INCLUDE_DIR" 
     21done 
     22AC_SUBST([JNI_INCLUDE_DIRS], $JNI_CFLAGS) 
     23 
     24# Checks for typedefs, structures, and compiler characteristics. 
     25AC_CHECK_HEADER_STDBOOL 
     26 
     27# Checks for header files. 
     28AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h]) 
     29AC_CHECK_HEADER([tdb.h], , [AC_MSG_ERROR([Couldn't find tdb.h])]) 
    1430 
    1531# Checks for libraries. 
    16  
    17 # Checks for header files. 
    18  
    19 # Checks for typedefs, structures, and compiler characteristics. 
     32AC_CHECK_LIB([tdb], [tdb_open]) 
    2033 
    2134# Checks for library functions. 
     35AC_CHECK_FUNCS([strerror]) 
    2236 
    2337# Completion