Changeset 18343 for greenstone3


Ignore:
Timestamp:
01/11/09 19:39:56 (12 years ago)
Author:
davidb
Message:

Modifications to support 64-bit architecture

Location:
greenstone3/trunk/src/packages/javagdbm
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/src/packages/javagdbm/configure

    r10917 r18343  
    11#! /bin/sh
    2 # From configure.in Revision: 1.3 .
     2# From configure.in Revision: 10917 .
    33# Guess values for system-dependent variables and create Makefiles.
    44# Generated by GNU Autoconf 2.59.
     
    311311#endif"
    312312
    313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java GDBM_LIBPATH GDBM_INCLUDE PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
     313ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S COMPAT32BITFLAGS CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java GDBM_LIBPATH GDBM_INCLUDE PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
    314314ac_subst_files=''
    315315
     
    832832
    833833  cat <<\_ACEOF
     834
     835System types:
     836  --build=BUILD     configure for building on BUILD [guessed]
     837  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
     838  --target=TARGET   configure for building compilers for TARGET [HOST]
    834839_ACEOF
    835840fi
     
    12991304fi;
    13001305
     1306ac_aux_dir=
     1307for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
     1308  if test -f $ac_dir/install-sh; then
     1309    ac_aux_dir=$ac_dir
     1310    ac_install_sh="$ac_aux_dir/install-sh -c"
     1311    break
     1312  elif test -f $ac_dir/install.sh; then
     1313    ac_aux_dir=$ac_dir
     1314    ac_install_sh="$ac_aux_dir/install.sh -c"
     1315    break
     1316  elif test -f $ac_dir/shtool; then
     1317    ac_aux_dir=$ac_dir
     1318    ac_install_sh="$ac_aux_dir/shtool install -c"
     1319    break
     1320  fi
     1321done
     1322if test -z "$ac_aux_dir"; then
     1323  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     1324echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
     1325   { (exit 1); exit 1; }; }
     1326fi
     1327ac_config_guess="$SHELL $ac_aux_dir/config.guess"
     1328ac_config_sub="$SHELL $ac_aux_dir/config.sub"
     1329ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
     1330
     1331# Make sure we can run config.sub.
     1332$ac_config_sub sun4 >/dev/null 2>&1 ||
     1333  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
     1334echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     1335   { (exit 1); exit 1; }; }
     1336
     1337echo "$as_me:$LINENO: checking build system type" >&5
     1338echo $ECHO_N "checking build system type... $ECHO_C" >&6
     1339if test "${ac_cv_build+set}" = set; then
     1340  echo $ECHO_N "(cached) $ECHO_C" >&6
     1341else
     1342  ac_cv_build_alias=$build_alias
     1343test -z "$ac_cv_build_alias" &&
     1344  ac_cv_build_alias=`$ac_config_guess`
     1345test -z "$ac_cv_build_alias" &&
     1346  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
     1347echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     1348   { (exit 1); exit 1; }; }
     1349ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
     1350  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
     1351echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
     1352   { (exit 1); exit 1; }; }
     1353
     1354fi
     1355echo "$as_me:$LINENO: result: $ac_cv_build" >&5
     1356echo "${ECHO_T}$ac_cv_build" >&6
     1357build=$ac_cv_build
     1358build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
     1359build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
     1360build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
     1361
     1362
     1363echo "$as_me:$LINENO: checking host system type" >&5
     1364echo $ECHO_N "checking host system type... $ECHO_C" >&6
     1365if test "${ac_cv_host+set}" = set; then
     1366  echo $ECHO_N "(cached) $ECHO_C" >&6
     1367else
     1368  ac_cv_host_alias=$host_alias
     1369test -z "$ac_cv_host_alias" &&
     1370  ac_cv_host_alias=$ac_cv_build_alias
     1371ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
     1372  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     1373echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
     1374   { (exit 1); exit 1; }; }
     1375
     1376fi
     1377echo "$as_me:$LINENO: result: $ac_cv_host" >&5
     1378echo "${ECHO_T}$ac_cv_host" >&6
     1379host=$ac_cv_host
     1380host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
     1381host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
     1382host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
     1383
     1384
     1385echo "$as_me:$LINENO: checking target system type" >&5
     1386echo $ECHO_N "checking target system type... $ECHO_C" >&6
     1387if test "${ac_cv_target+set}" = set; then
     1388  echo $ECHO_N "(cached) $ECHO_C" >&6
     1389else
     1390  ac_cv_target_alias=$target_alias
     1391test "x$ac_cv_target_alias" = "x" &&
     1392  ac_cv_target_alias=$ac_cv_host_alias
     1393ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
     1394  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
     1395echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
     1396   { (exit 1); exit 1; }; }
     1397
     1398fi
     1399echo "$as_me:$LINENO: result: $ac_cv_target" >&5
     1400echo "${ECHO_T}$ac_cv_target" >&6
     1401target=$ac_cv_target
     1402target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
     1403target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
     1404target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
     1405
     1406
     1407# The aliases save the names the user supplied, while $host etc.
     1408# will get canonicalized.
     1409test -n "$target_alias" &&
     1410  test "$program_prefix$program_suffix$program_transform_name" = \
     1411    NONENONEs,x,x, &&
     1412  program_prefix=${target_alias}-
     1413
    13011414# TODO: allow the user to specify whether they want a debugging
    13021415# library or not?
     
    22322345ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    22332346ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2234 
    2235 ac_aux_dir=
    2236 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    2237   if test -f $ac_dir/install-sh; then
    2238     ac_aux_dir=$ac_dir
    2239     ac_install_sh="$ac_aux_dir/install-sh -c"
    2240     break
    2241   elif test -f $ac_dir/install.sh; then
    2242     ac_aux_dir=$ac_dir
    2243     ac_install_sh="$ac_aux_dir/install.sh -c"
    2244     break
    2245   elif test -f $ac_dir/shtool; then
    2246     ac_aux_dir=$ac_dir
    2247     ac_install_sh="$ac_aux_dir/shtool install -c"
    2248     break
    2249   fi
    2250 done
    2251 if test -z "$ac_aux_dir"; then
    2252   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    2253 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    2254    { (exit 1); exit 1; }; }
    2255 fi
    2256 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
    2257 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
    2258 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
    22592347
    22602348# Find a good install program.  We prefer a C program (faster),
     
    23472435echo "${ECHO_T}no, using $LN_S" >&6
    23482436fi
     2437
     2438
     2439echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5
     2440echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6
     2441arch_64bit=no
     2442case "$host_cpu" in
     2443x86_64) arch_64bit=yes ;;
     2444esac
     2445
     2446if test "$arch_64bit" = yes; then
     2447  echo "$as_me:$LINENO: result: yes" >&5
     2448echo "${ECHO_T}yes" >&6
     2449  if test -z "$COMPAT32BITFLAGS" ; then
     2450    COMPAT32BITFLAGS="-m32"
     2451  fi
     2452else
     2453  echo "$as_me:$LINENO: result: no" >&5
     2454echo "${ECHO_T}no" >&6
     2455  if test -z "$COMPAT32BITFLAGS" ; then
     2456    COMPAT32BITFLAGS=
     2457  fi
     2458fi
     2459export COMPAT32BITFLAGS
     2460
     2461
    23492462
    23502463
     
    50445157s,@ECHO_T@,$ECHO_T,;t t
    50455158s,@LIBS@,$LIBS,;t t
     5159s,@build@,$build,;t t
     5160s,@build_cpu@,$build_cpu,;t t
     5161s,@build_vendor@,$build_vendor,;t t
     5162s,@build_os@,$build_os,;t t
     5163s,@host@,$host,;t t
     5164s,@host_cpu@,$host_cpu,;t t
     5165s,@host_vendor@,$host_vendor,;t t
     5166s,@host_os@,$host_os,;t t
     5167s,@target@,$target,;t t
     5168s,@target_cpu@,$target_cpu,;t t
     5169s,@target_vendor@,$target_vendor,;t t
     5170s,@target_os@,$target_os,;t t
    50465171s,@CC@,$CC,;t t
    50475172s,@CFLAGS@,$CFLAGS,;t t
     
    50555180s,@INSTALL_DATA@,$INSTALL_DATA,;t t
    50565181s,@LN_S@,$LN_S,;t t
     5182s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t
    50575183s,@CPP@,$CPP,;t t
    50585184s,@EGREP@,$EGREP,;t t
  • greenstone3/trunk/src/packages/javagdbm/configure.in

    r10917 r18343  
    3030AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
    3131
     32dnl get $target_cpu, $target_vendor, and $target_os
     33dnl (as well as host_*)
     34AC_CANONICAL_SYSTEM
     35
    3236# TODO: allow the user to specify whether they want a debugging
    3337# library or not?
     
    3741AC_PROG_INSTALL
    3842AC_PROG_LN_S
     43
     44AC_MSG_CHECKING(to see if architecture is 64-bit)
     45arch_64bit=no
     46case "$host_cpu" in
     47x86_64) arch_64bit=yes ;;
     48esac
     49
     50if test "$arch_64bit" = yes; then
     51  AC_MSG_RESULT(yes)
     52  if test -z "$COMPAT32BITFLAGS" ; then
     53    COMPAT32BITFLAGS="-m32"
     54  fi
     55else
     56  AC_MSG_RESULT(no)
     57  if test -z "$COMPAT32BITFLAGS" ; then
     58    COMPAT32BITFLAGS=
     59  fi
     60fi
     61export COMPAT32BITFLAGS
     62AC_SUBST(COMPAT32BITFLAGS)
     63
     64
    3965
    4066AC_CHECK_SIZEOF(void *)
  • greenstone3/trunk/src/packages/javagdbm/jni/Makefile.in

    r10917 r18343  
    2323
    2424CC=@CC@
    25 CFLAGS=-c @CFLAGS@ $(INC) -DWRAPPER_VERSION=\"$(WRAPPER_VERSION)\"
     25CFLAGS=-c @CFLAGS@ @COMPAT32BITFLAGS@ $(INC) -DWRAPPER_VERSION=\"$(WRAPPER_VERSION)\"
    2626#PKG=@PKG@
    2727GDBM_LIBS=@GDBM_LIBPATH@ -lgdbm
    2828LIBS= $(GDBM_LIBS) @LIBS@
    29 LDFLAGS = @LDFLAGS@
     29LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3030JNIFLAGS=@JNIFLAGS@
    3131JNISUFFIX=@JNISUFFIX@
Note: See TracChangeset for help on using the changeset viewer.