Changeset 15819

Show
Ignore:
Timestamp:
30.05.2008 12:01:05 (11 years ago)
Author:
ak19
Message:

Dr Bainbridge updated the configure and makefiles for GS3 gs2build with 1. COMP32bitFlag stuff and 2. CPP -> CXX stuff

Location:
other-projects/trunk/gs2build-extra
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • other-projects/trunk/gs2build-extra/configure

    r15295 r15819  
    311311 
    312312ac_subdirs_all="$ac_subdirs_all packages indexers" 
    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 PACKAGE VERSION ENABLE_ACCENTFOLD CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs 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 PACKAGE VERSION ENABLE_ACCENTFOLD CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS CPP EGREP ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS' 
    314314ac_subst_files='' 
    315315 
     
    861861  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no) 
    862862  --with-gdbm=dir         Use local gdbm library and headers 
    863   --with-dmalloc          use dmalloc, as in 
    864                           ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz 
    865   --with-regex            use older regex in lieu of GNU rx for matching 
    866863 
    867864Some influential environment variables: 
     
    30323029 
    30333030 
     3031echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5 
     3032echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6 
     3033arch_64bit=no 
     3034case "$host_cpu" in 
     3035x86_64) arch_64bit=yes ;; 
     3036esac 
     3037 
     3038if test "$arch_64bit" = yes; then 
     3039  echo "$as_me:$LINENO: result: yes" >&5 
     3040echo "${ECHO_T}yes" >&6 
     3041  if test -z "$COMPAT32BITFLAGS" ; then 
     3042    COMPAT32BITFLAGS="-m32" 
     3043  fi 
     3044else 
     3045  echo "$as_me:$LINENO: result: no" >&5 
     3046echo "${ECHO_T}no" >&6 
     3047  if test -z "$COMPAT32BITFLAGS" ; then 
     3048    COMPAT32BITFLAGS= 
     3049  fi 
     3050fi 
     3051export COMPAT32BITFLAGS 
     3052 
     3053 
     3054 
     3055 
    30343056ac_ext=c 
    30353057ac_cpp='$CPP $CPPFLAGS' 
     
    38373859fi 
    38383860 
    3839 echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 
    3840 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 
    3841 if test "${ac_cv_prog_cc_stdc+set}" = set; then 
    3842   echo $ECHO_N "(cached) $ECHO_C" >&6 
    3843 else 
    3844   ac_cv_prog_cc_stdc=no 
    3845 ac_save_CFLAGS="$CFLAGS" 
    3846 # Don't try gcc -ansi; that turns off useful extensions and 
    3847 # breaks some systems' header files. 
    3848 # AIX           -qlanglvl=ansi 
    3849 # Ultrix and OSF/1  -std1 
    3850 # HP-UX         -Aa -D_HPUX_SOURCE 
    3851 # SVR4          -Xc 
    3852 for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc 
    3853 do 
    3854   CFLAGS="$ac_save_CFLAGS $ac_arg" 
    3855   cat >conftest.$ac_ext <<_ACEOF 
    3856 /* confdefs.h.  */ 
    3857 _ACEOF 
    3858 cat confdefs.h >>conftest.$ac_ext 
    3859 cat >>conftest.$ac_ext <<_ACEOF 
    3860 /* end confdefs.h.  */ 
    3861 #if !defined(__STDC__) || __STDC__ != 1 
    3862 choke me 
    3863 #endif 
    3864  
    3865 int 
    3866 main () 
    3867 { 
    3868 int test (int i, double x); 
    3869 struct s1 {int (*f) (int a);}; 
    3870 struct s2 {int (*f) (double a);}; 
    3871   ; 
    3872   return 0; 
    3873 } 
    3874 _ACEOF 
    3875 rm -f conftest.$ac_objext 
    3876 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 
    3877   (eval $ac_compile) 2>conftest.er1 
    3878   ac_status=$? 
    3879   grep -v '^ *+' conftest.er1 >conftest.err 
    3880   rm -f conftest.er1 
    3881   cat conftest.err >&5 
    3882   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    3883   (exit $ac_status); } && 
    3884      { ac_try='test -z "$ac_c_werror_flag" 
    3885              || test ! -s conftest.err' 
    3886   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    3887   (eval $ac_try) 2>&5 
    3888   ac_status=$? 
    3889   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    3890   (exit $ac_status); }; } && 
    3891      { ac_try='test -s conftest.$ac_objext' 
    3892   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    3893   (eval $ac_try) 2>&5 
    3894   ac_status=$? 
    3895   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    3896   (exit $ac_status); }; }; then 
    3897   ac_cv_prog_cc_stdc="$ac_arg"; break 
    3898 else 
    3899   echo "$as_me: failed program was:" >&5 
    3900 sed 's/^/| /' conftest.$ac_ext >&5 
    3901  
    3902 fi 
    3903 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 
    3904 done 
    3905 CFLAGS="$ac_save_CFLAGS" 
    3906  
    3907 fi 
    3908  
    3909 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 
    3910 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 
    3911 case "x$ac_cv_prog_cc_stdc" in 
    3912   x|xno) ;; 
    3913   *) CC="$CC $ac_cv_prog_cc_stdc" ;; 
    3914 esac 
    3915  
    3916  
    3917 echo "$as_me:$LINENO: checking for function prototypes" >&5 
    3918 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 
    3919 if test "$ac_cv_prog_cc_stdc" != no; then 
    3920   echo "$as_me:$LINENO: result: yes" >&5 
    3921 echo "${ECHO_T}yes" >&6 
    3922   cat >>confdefs.h <<\_ACEOF 
    3923 #define PROTOTYPES 1 
    3924 _ACEOF 
    3925  
    3926   U= ANSI2KNR= 
    3927 else 
    3928   echo "$as_me:$LINENO: result: no" >&5 
    3929 echo "${ECHO_T}no" >&6 
    3930   U=_ ANSI2KNR=ansi2knr 
    3931 fi 
    3932  
     3861fp_C_PROTOTYPES 
    39333862echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 
    39343863echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 
     
    64806409 
    64816410 
    6482 echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5 
    6483 echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6 
    6484  
    6485 # Check whether --with-dmalloc or --without-dmalloc was given. 
    6486 if test "${with_dmalloc+set}" = set; then 
    6487   withval="$with_dmalloc" 
    6488   if test "$withval" = yes; then 
    6489   echo "$as_me:$LINENO: result: yes" >&5 
    6490 echo "${ECHO_T}yes" >&6 
    6491   cat >>confdefs.h <<\_ACEOF 
    6492 #define WITH_DMALLOC 1 
    6493 _ACEOF 
    6494  
    6495   LIBS="$LIBS -ldmalloc" 
    6496   LDFLAGS="$LDFLAGS -g" 
    6497 else 
    6498   echo "$as_me:$LINENO: result: no" >&5 
    6499 echo "${ECHO_T}no" >&6 
    6500 fi 
    6501 else 
    6502   echo "$as_me:$LINENO: result: no" >&5 
    6503 echo "${ECHO_T}no" >&6 
    6504 fi; 
    6505  
    6506 echo "$as_me:$LINENO: checking which of rx or regex is wanted" >&5 
    6507 echo $ECHO_N "checking which of rx or regex is wanted... $ECHO_C" >&6 
    6508  
    6509 # Check whether --with-regex or --without-regex was given. 
    6510 if test "${with_regex+set}" = set; then 
    6511   withval="$with_regex" 
    6512   if test "$withval" = yes; then 
    6513   ac_with_regex=1 
    6514   echo "$as_me:$LINENO: result: regex" >&5 
    6515 echo "${ECHO_T}regex" >&6 
    6516   cat >>confdefs.h <<\_ACEOF 
    6517 #define WITH_REGEX 1 
    6518 _ACEOF 
    6519  
    6520   case $LIBOBJS in 
    6521     "regex.$ac_objext"   | \ 
    6522   *" regex.$ac_objext"   | \ 
    6523     "regex.$ac_objext "* | \ 
    6524   *" regex.$ac_objext "* ) ;; 
    6525   *) LIBOBJS="$LIBOBJS regex.$ac_objext" ;; 
    6526 esac 
    6527  
    6528 fi 
    6529 fi; 
    6530 if test -z "$ac_with_regex"; then 
    6531   echo "$as_me:$LINENO: result: rx" >&5 
    6532 echo "${ECHO_T}rx" >&6 
    6533   echo "$as_me:$LINENO: checking for re_rx_search" >&5 
    6534 echo $ECHO_N "checking for re_rx_search... $ECHO_C" >&6 
    6535 if test "${ac_cv_func_re_rx_search+set}" = set; then 
    6536   echo $ECHO_N "(cached) $ECHO_C" >&6 
    6537 else 
    6538   cat >conftest.$ac_ext <<_ACEOF 
    6539 /* confdefs.h.  */ 
    6540 _ACEOF 
    6541 cat confdefs.h >>conftest.$ac_ext 
    6542 cat >>conftest.$ac_ext <<_ACEOF 
    6543 /* end confdefs.h.  */ 
    6544 /* Define re_rx_search to an innocuous variant, in case <limits.h> declares re_rx_search. 
    6545    For example, HP-UX 11i <limits.h> declares gettimeofday.  */ 
    6546 #define re_rx_search innocuous_re_rx_search 
    6547  
    6548 /* System header to define __stub macros and hopefully few prototypes, 
    6549     which can conflict with char re_rx_search (); below. 
    6550     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 
    6551     <limits.h> exists even on freestanding compilers.  */ 
    6552  
    6553 #ifdef __STDC__ 
    6554 # include <limits.h> 
    6555 #else 
    6556 # include <assert.h> 
    6557 #endif 
    6558  
    6559 #undef re_rx_search 
    6560  
    6561 /* Override any gcc2 internal prototype to avoid an error.  */ 
    6562 #ifdef __cplusplus 
    6563 extern "C" 
    6564 { 
    6565 #endif 
    6566 /* We use char because int might match the return type of a gcc2 
    6567    builtin and then its argument prototype would still apply.  */ 
    6568 char re_rx_search (); 
    6569 /* The GNU C library defines this for functions which it implements 
    6570     to always fail with ENOSYS.  Some functions are actually named 
    6571     something starting with __ and the normal name is an alias.  */ 
    6572 #if defined (__stub_re_rx_search) || defined (__stub___re_rx_search) 
    6573 choke me 
    6574 #else 
    6575 char (*f) () = re_rx_search; 
    6576 #endif 
    6577 #ifdef __cplusplus 
    6578 } 
    6579 #endif 
    6580  
    6581 int 
    6582 main () 
    6583 { 
    6584 return f != re_rx_search; 
    6585   ; 
    6586   return 0; 
    6587 } 
    6588 _ACEOF 
    6589 rm -f conftest.$ac_objext conftest$ac_exeext 
    6590 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 
    6591   (eval $ac_link) 2>conftest.er1 
    6592   ac_status=$? 
    6593   grep -v '^ *+' conftest.er1 >conftest.err 
    6594   rm -f conftest.er1 
    6595   cat conftest.err >&5 
    6596   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    6597   (exit $ac_status); } && 
    6598      { ac_try='test -z "$ac_c_werror_flag" 
    6599              || test ! -s conftest.err' 
    6600   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    6601   (eval $ac_try) 2>&5 
    6602   ac_status=$? 
    6603   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    6604   (exit $ac_status); }; } && 
    6605      { ac_try='test -s conftest$ac_exeext' 
    6606   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    6607   (eval $ac_try) 2>&5 
    6608   ac_status=$? 
    6609   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    6610   (exit $ac_status); }; }; then 
    6611   ac_cv_func_re_rx_search=yes 
    6612 else 
    6613   echo "$as_me: failed program was:" >&5 
    6614 sed 's/^/| /' conftest.$ac_ext >&5 
    6615  
    6616 ac_cv_func_re_rx_search=no 
    6617 fi 
    6618 rm -f conftest.err conftest.$ac_objext \ 
    6619       conftest$ac_exeext conftest.$ac_ext 
    6620 fi 
    6621 echo "$as_me:$LINENO: result: $ac_cv_func_re_rx_search" >&5 
    6622 echo "${ECHO_T}$ac_cv_func_re_rx_search" >&6 
    6623 if test $ac_cv_func_re_rx_search = yes; then 
    6624   : 
    6625 else 
    6626   case $LIBOBJS in 
    6627     "rx.$ac_objext"   | \ 
    6628   *" rx.$ac_objext"   | \ 
    6629     "rx.$ac_objext "* | \ 
    6630   *" rx.$ac_objext "* ) ;; 
    6631   *) LIBOBJS="$LIBOBJS rx.$ac_objext" ;; 
    6632 esac 
    6633  
    6634 fi 
    6635  
    6636 fi 
    6637  
     6411fp_WITH_DMALLOC 
     6412fp_WITH_REGEX 
    66386413 
    66396414# --------------------------------------------------------------------------- 
     
    79577732s,@RANLIB@,$RANLIB,;t t 
    79587733s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t 
     7734s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t 
    79597735s,@CPP@,$CPP,;t t 
    79607736s,@EGREP@,$EGREP,;t t 
    7961 s,@U@,$U,;t t 
    7962 s,@ANSI2KNR@,$ANSI2KNR,;t t 
    79637737s,@ALLOCA@,$ALLOCA,;t t 
    79647738s,@LIBOBJS@,$LIBOBJS,;t t 
  • other-projects/trunk/gs2build-extra/configure.in

    r15295 r15819  
    4747AC_PROG_MAKE_SET 
    4848AC_PROG_RANLIB 
     49 
     50 
     51AC_MSG_CHECKING(to see if architecture is 64-bit) 
     52arch_64bit=no 
     53case "$host_cpu" in 
     54x86_64) arch_64bit=yes ;; 
     55esac 
     56 
     57if test "$arch_64bit" = yes; then 
     58  AC_MSG_RESULT(yes) 
     59  if test -z "$COMPAT32BITFLAGS" ; then 
     60    COMPAT32BITFLAGS="-m32" 
     61  fi 
     62else 
     63  AC_MSG_RESULT(no) 
     64  if test -z "$COMPAT32BITFLAGS" ; then 
     65    COMPAT32BITFLAGS= 
     66  fi 
     67fi 
     68export COMPAT32BITFLAGS 
     69AC_SUBST(COMPAT32BITFLAGS) 
     70 
    4971 
    5072dnl Checks for typedefs, structures, and compiler characteristics. 
  • other-projects/trunk/gs2build-extra/lib.Makefile.in

    r13731 r15819  
    2727 
    2828AR = ar 
    29 CC = @CC@ 
    30 CPP = @CXX@ 
    31 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 
    32 CCFLAGS = @CFLAGS@ 
     29CXX = @CXX@  
     30#CXXFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 
     31CXXFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ 
    3332DEFS = @DEFS@ 
    3433INCLUDES = -I../indexers/mg/lib -I.. 
    3534RANLIB = @RANLIB@ 
    3635 
    37 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 
    38 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 
     36CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 
    3937 
    4038.SUFFIXES: 
     
    4543.SUFFIXES: .cpp .o 
    4644.cpp.o: 
    47     $(CPPCOMPILE) $<  
     45    $(CXXCOMPILE) $<  
    4846 
    4947HEADERS = \ 
     
    7472 
    7573depend: 
    76     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES) 
     74    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES) 
    7775 
    7876 
  • other-projects/trunk/gs2build-extra/packages.configure

    r13980 r15819  
    135135gzip -dc expat-1.95.8.tar.gz | tar -xf - 
    136136cd "$PACKAGES/expat/expat-1.95.8" && \ 
    137 ./configure $CACHE_FILE --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
     137CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
    138138 
    139139# configure XML::Parser perl module