greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16261

Show
Ignore:
Timestamp:
2008-07-01 16:56:47 (5 months ago)
Author:
ak19
Message:

Dr Bainbridge: Minor tweaks to bring GS3's gs2build compilation files up to date with changes in file structure. Also ran 'autoupdate' on configure.in in an attempt to update a couple of macros that now no longer seem valid (e.g. fp_WITH_DMALLOC). This had the effect of updating some parts on configure.in to newer syntax, but not the offending two macros. These still cause warning messages to be generated with ./configure is run.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • other-projects/trunk/gs2build-extra/configure

    r16070 r16261  
    13111311 
    13121312 
     1313 
    13131314          ac_config_headers="$ac_config_headers config.h" 
    13141315 
    …… 
    70827083srclist="src/hashfile/Makefile src/gdbmedit/txt2db/Makefile src/gdbmedit/db2txt/Makefile src/phind/generate/Makefile " 
    70837084 
    7084                                                   ac_config_files="$ac_config_files packages/Makefile lib/Makefile Makefile $srclist $moduleDirs" 
     7085                                                  ac_config_files="$ac_config_files packages/Makefile src/lib/Makefile Makefile $srclist $moduleDirs" 
     7086 
    70857087cat >confcache <<\_ACEOF 
    70867088# This file is a shell script that caches the results of configure 
    …… 
    76097611  # Handling of arguments. 
    76107612  "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;; 
    7611   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; 
     7613  "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; 
    76127614  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 
    76137615  "$srclist" ) CONFIG_FILES="$CONFIG_FILES $srclist" ;; 

  • other-projects/trunk/gs2build-extra/configure.in

    r16070 r16261  
    22dnl Use autoconf-2.59 or later... it might not work anymore with 
    33dnl the older 2.1x versions - jrm21 12/2004 
    4 AC_INIT(src/lib/text_t.h) 
     4AC_INIT 
     5AC_CONFIG_SRCDIR([src/lib/text_t.h]) 
    56AC_CONFIG_HEADER(config.h) 
    67 
    …… 
    4041dnl get $target_cpu, $target_vendor, and $target_os 
    4142dnl (as well as host_*) 
    42 AC_CANONICAL_SYSTEM 
     43AC_CANONICAL_TARGET([]) 
    4344dnl do we actually want this? It adds a prefix based on host, system etc 
    4445dnl AC_ARG_PROGRAM 
    …… 
    8889dnl Unfortunately -D_{XOPEN,POSIX}_SOURCE can't provide all that mg 
    8990dnl needs. So drop back to -Xa 
    90 AC_TRY_COMPILE( 
    91 [#include <stdio.h> 
    92 ], [ FILE *rubbish = popen("yes", "r"); ],, 
    93 [CC="`echo $CC | sed 's/-Xc/-Xa/'`"    ac_cv_prog_cc_stdc='-Xa']) 
     91AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 
     92]], [[ FILE *rubbish = popen("yes", "r"); ]])],[],[CC="`echo $CC | sed 's/-Xc/-Xa/'`"    ac_cv_prog_cc_stdc='-Xa']) 
    9493fi 
    9594dnl ---------------------- 
    …… 
    9897dnl Checks for libraries. 
    9998dnl check for -lg: 
    100 AC_HAVE_LIBRARY(g) 
     99AC_CHECK_LIB([g],[main],[],[],[])ac_cv_lib_g=ac_cv_lib_g_main 
     100 
    101101dnl check for -lm: 
    102 AC_HAVE_LIBRARY(m) 
     102AC_CHECK_LIB([m],[main],[],[],[])ac_cv_lib_m=ac_cv_lib_m_main 
     103 
    103104dnl check for -lcrypt: 
    104 AC_HAVE_LIBRARY(crypt) 
     105AC_CHECK_LIB([crypt],[main],[],[],[])ac_cv_lib_crypt=ac_cv_lib_crypt_main 
     106 
    105107if test $ENABLE_ACCENTFOLD = 1; then 
    106 AC_HAVE_LIBRARY(ICONV) 
     108AC_CHECK_LIB([ICONV],[main],[],[],[])ac_cv_lib_ICONV=ac_cv_lib_ICONV_main 
     109 
    107110fi 
    108111 
    …… 
    166169dnl Switch into C++ 
    167170dnl 
    168 AC_LANG_CPLUSPLUS 
     171AC_LANG([C++]) 
    169172 
    170173dnl 
    …… 
    202205if test -z "$GDBM_INCLUDE" ; then 
    203206  # try in system directory  
    204   AC_TRY_COMPILE( 
    205   [#include <gdbm.h> 
    206 ], 
    207   [], 
    208   success=yes, 
    209   success=no 
    210   ) 
     207  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gdbm.h> 
     208]], [[]])],[success=yes],[success=no 
     209  ]) 
    211210 
    212211  if test $success = "no"; then 
    …… 
    218217      CXXFLAGS="$CXXFLAGS -I/usr/local/include" 
    219218      LIBS="$LIBS -L/usr/local/lib -lgdbm" 
    220       AC_TRY_LINK( 
    221         [#include <gdbm.h> 
     219      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gdbm.h> 
    222220#include <stdio.h> 
    223         ], 
    224         [printf("%s",gdbm_version);], 
    225         success=/usr/local, 
    226         success=no 
    227       ) 
     221        ]], [[printf("%s",gdbm_version);]])],[success=/usr/local],[success=no 
     222      ]) 
    228223      CXXFLAGS=$ac_save_CXXFLAGS 
    229224      LIBS=$ac_save_LIBS 
    …… 
    291286 
    292287dnl - first shot, try simple good old vector on its own 
    293 AC_TRY_COMPILE( 
    294 [#include <vector> 
    295 ],  
    296 [], 
    297 success=yes, 
    298 ) 
     288AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <vector> 
     289]], [[]])],[success=yes],[]) 
    299290 
    300291dnl - try using the .h equivalent 
    301292if test $success = "no"; then 
    302 AC_TRY_COMPILE( 
    303 [#include <vector.h> 
    304 ],  
    305 [], 
    306 success="yes", 
    307 ) 
     293AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <vector.h> 
     294]], [[]])],[success="yes"],[]) 
    308295fi 
    309296 
    310297dnl - now try for the objectspace headers 
    311298if test $success = "no"; then 
    312 AC_TRY_COMPILE( 
    313 [#include <ospace\\std\\vector> 
    314 ],  
    315 [], 
    316 success="yes", 
    317 ) 
     299AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ospace\\std\\vector> 
     300]], [[]])],[success="yes"],[]) 
    318301fi 
    319302 
    …… 
    377360srclist="src/hashfile/Makefile src/gdbmedit/txt2db/Makefile src/gdbmedit/db2txt/Makefile src/phind/generate/Makefile " 
    378361 
    379 AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs) 
     362AC_CONFIG_FILES([packages/Makefile src/lib/Makefile Makefile $srclist $moduleDirs]) 
     363AC_OUTPUT 

  • other-projects/trunk/gs2build-extra/lib.Makefile.in

    r15819 r16261  
    3131CXXFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ 
    3232DEFS = @DEFS@ 
    33 INCLUDES = -I../indexers/mg/lib -I.. 
     33INCLUDES = -I../../indexers/mg/lib -I../.. 
    3434RANLIB = @RANLIB@ 
    3535