Changeset 21432 for main/trunk
- Timestamp:
- 2010-01-06T17:30:17+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/configure
r18214 r21432 3133 3133 fi 3134 3134 fi 3135 3136 # Only need compat32bitflag if using MG or MGPP 3137 if test "$ENABLE_MG" = "0" ; then 3138 COMPAT32BITFLAGS= 3139 else 3140 if test "$ENABLE_MGPP" = "0" ; then 3141 COMPAT32BITFLAGS= 3142 fi 3143 fi 3144 3135 3145 export COMPAT32BITFLAGS 3136 3146 -
main/trunk/greenstone2/build-src/configure.in
r18214 r21432 115 115 fi 116 116 fi 117 118 # Only need compat32bitflag if using MG or MGPP 119 if test "$ENABLE_MG" = "0" ; then 120 COMPAT32BITFLAGS= 121 else 122 if test "$ENABLE_MGPP" = "0" ; then 123 COMPAT32BITFLAGS= 124 fi 125 fi 126 117 127 export COMPAT32BITFLAGS 118 128 AC_SUBST(COMPAT32BITFLAGS) -
main/trunk/greenstone2/common-src/configure
r21418 r21432 3233 3233 fi 3234 3234 fi 3235 3236 # Only need compat32bitflag if using MG or MGPP 3237 if test "$ENABLE_MG" = "0" ; then 3238 COMPAT32BITFLAGS= 3239 else 3240 if test "$ENABLE_MGPP" = "0" ; then 3241 COMPAT32BITFLAGS= 3242 fi 3243 fi 3244 3235 3245 export COMPAT32BITFLAGS 3236 3246 -
main/trunk/greenstone2/common-src/configure.in
r21417 r21432 178 178 fi 179 179 fi 180 181 # Only need compat32bitflag if using MG or MGPP 182 if test "$ENABLE_MG" = "0" ; then 183 COMPAT32BITFLAGS= 184 else 185 if test "$ENABLE_MGPP" = "0" ; then 186 COMPAT32BITFLAGS= 187 fi 188 fi 189 180 190 export COMPAT32BITFLAGS 181 191 AC_SUBST(COMPAT32BITFLAGS) -
main/trunk/greenstone2/common-src/packages/configure
r21419 r21432 158 158 159 159 # configure 160 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE -- disable-shared--prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT160 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 161 161 cd "$PACKAGES/iconv/libiconv-1.13.1" && \ 162 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE -- disable-shared--prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT162 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 163 163 164 164 # make … … 169 169 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT 170 170 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT 171 172 if test ! -z "$COMPAT32BITFLAGS" ; then 173 echo "Generating native 64-bit version as well" 174 # used in apache web server, for example 175 176 # dist clean 177 cd "$PACKAGES/iconv/libiconv-1.13.1" 178 echo make distclean && \ 179 make distclean 180 181 # configure 182 echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 183 ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 184 185 # make 186 echo make $HOSTTARGETFLAGS $ENVIRONMENT 187 make $HOSTTARGETFLAGS $ENVIRONMENT 188 189 # make install 190 make install $HOSTTARGETFLAGS $ENVIRONMENT 191 make install $HOSTTARGETFLAGS $ENVIRONMENT 192 193 fi 171 194 172 195 #./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&& -
main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure
r18345 r21432 7520 7520 7521 7521 7522 echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5 7523 echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6 7524 arch_64bit=no 7525 case "$host_cpu" in 7526 x86_64) arch_64bit=yes ;; 7527 esac 7528 7529 if test "$arch_64bit" = yes; then 7530 echo "$as_me:$LINENO: result: yes" >&5 7531 echo "${ECHO_T}yes" >&6 7532 if test -z "$COMPAT32BITFLAGS" ; then 7533 COMPAT32BITFLAGS="-m32" 7534 fi 7535 else 7536 echo "$as_me:$LINENO: result: no" >&5 7537 echo "${ECHO_T}no" >&6 7538 if test -z "$COMPAT32BITFLAGS" ; then 7539 COMPAT32BITFLAGS= 7540 fi 7541 fi 7542 export COMPAT32BITFLAGS 7522 7523 7524 cat >>confdefs.h <<_ACEOF 7525 #define COMPAT32BITFLAGS $COMPAT32BITFLAGS 7526 _ACEOF 7527 7543 7528 7544 7529 -
main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure.in
r18345 r21432 16 16 dnl AC_C_BIGENDIAN([]) 17 17 18 AC_MSG_CHECKING(to see if architecture is 64-bit) 19 arch_64bit=no 20 case "$host_cpu" in 21 x86_64) arch_64bit=yes ;; 22 esac 18 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 19 dnl arch_64bit=no 20 dnl case "$host_cpu" in 21 dnl x86_64) arch_64bit=yes ;; 22 dnl esac 23 dnl 24 dnl if test "$arch_64bit" = yes; then 25 dnl AC_MSG_RESULT(yes) 26 dnl if test -z "$COMPAT32BITFLAGS" ; then 27 dnl COMPAT32BITFLAGS="-m32" 28 dnl LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32" 29 dnl fi 30 dnl else 31 dnl AC_MSG_RESULT(no) 32 dnl if test -z "$COMPAT32BITFLAGS" ; then 33 dnl COMPAT32BITFLAGS= 34 dnl LIBTOOLCOMPAT32BITFLAGS= 35 dnl fi 36 dnl fi 37 dnl export COMPAT32BITFLAGS 38 dnl AC_SUBST(COMPAT32BITFLAGS) 23 39 24 if test "$arch_64bit" = yes; then 25 AC_MSG_RESULT(yes) 26 if test -z "$COMPAT32BITFLAGS" ; then 27 COMPAT32BITFLAGS="-m32" 28 LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32" 29 fi 30 else 31 AC_MSG_RESULT(no) 32 if test -z "$COMPAT32BITFLAGS" ; then 33 COMPAT32BITFLAGS= 34 LIBTOOLCOMPAT32BITFLAGS= 35 fi 36 fi 37 export COMPAT32BITFLAGS 40 41 AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS) 38 42 AC_SUBST(COMPAT32BITFLAGS) 39 43 -
main/trunk/greenstone2/configure
r21418 r21432 3248 3248 fi 3249 3249 fi 3250 3251 # Only need compat32bitflag if using MG or MGPP 3252 if test "$ENABLE_MG" = "0" ; then 3253 COMPAT32BITFLAGS= 3254 else 3255 if test "$ENABLE_MGPP" = "0" ; then 3256 COMPAT32BITFLAGS= 3257 fi 3258 fi 3259 3250 3260 export COMPAT32BITFLAGS 3251 3261 -
main/trunk/greenstone2/configure.in
r21417 r21432 189 189 fi 190 190 fi 191 192 # Only need compat32bitflag if using MG or MGPP 193 if test "$ENABLE_MG" = "0" ; then 194 COMPAT32BITFLAGS= 195 else 196 if test "$ENABLE_MGPP" = "0" ; then 197 COMPAT32BITFLAGS= 198 fi 199 fi 200 191 201 export COMPAT32BITFLAGS 192 202 AC_SUBST(COMPAT32BITFLAGS) -
main/trunk/greenstone2/runtime-src/configure
r21329 r21432 3205 3205 fi 3206 3206 fi 3207 3208 # Only need compat32bitflag if using MG or MGPP 3209 if test "$ENABLE_MG" = "0" ; then 3210 COMPAT32BITFLAGS= 3211 else 3212 if test "$ENABLE_MGPP" = "0" ; then 3213 COMPAT32BITFLAGS= 3214 fi 3215 fi 3216 3207 3217 export COMPAT32BITFLAGS 3208 3218 -
main/trunk/greenstone2/runtime-src/configure.in
r21329 r21432 159 159 fi 160 160 fi 161 162 # Only need compat32bitflag if using MG or MGPP 163 if test "$ENABLE_MG" = "0" ; then 164 COMPAT32BITFLAGS= 165 else 166 if test "$ENABLE_MGPP" = "0" ; then 167 COMPAT32BITFLAGS= 168 fi 169 fi 170 161 171 export COMPAT32BITFLAGS 162 172 AC_SUBST(COMPAT32BITFLAGS)
Note:
See TracChangeset
for help on using the changeset viewer.