Changeset 15562

Show
Ignore:
Timestamp:
18.05.2008 22:21:56 (11 years ago)
Author:
davidb
Message:

Addition of COMPAT32BITFLAGS to help compilation on a 64-bit machine

Location:
indexers/trunk/packages/unac
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • indexers/trunk/packages/unac/Makefile.in

    r13695 r15562  
    3232DEFS = @DEFS@ -DUNAC_VERSION=\"$(VERSION)\" 
    3333INCLUDES =  
    34 CFLAGS = @CFLAGS@ 
     34CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ 
    3535 
    3636COMPILE = $(CC) -c $(DEFS) $(INCLUDES)  $(CFLAGS) 
  • indexers/trunk/packages/unac/configure

    r13670 r15562  
    469469#endif" 
    470470 
    471 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 VERSION SET_MAKE UNICODE_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL PERL SH MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBICONV LTLIBICONV LIBOBJS LTLIBOBJS' 
     471ac_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 VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE COMPAT32BITFLAGS UNICODE_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL PERL SH MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBICONV LTLIBICONV LIBOBJS LTLIBOBJS' 
    472472ac_subst_files='' 
    473473 
     
    994994  --build=BUILD     configure for building on BUILD [guessed] 
    995995  --host=HOST       cross-compile to build programs to run on HOST [BUILD] 
     996  --target=TARGET   configure for building compilers for TARGET [HOST] 
    996997_ACEOF 
    997998fi 
     
    14711472 
    14721473 
     1474 
     1475ac_aux_dir= 
     1476for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do 
     1477  if test -f $ac_dir/install-sh; then 
     1478    ac_aux_dir=$ac_dir 
     1479    ac_install_sh="$ac_aux_dir/install-sh -c" 
     1480    break 
     1481  elif test -f $ac_dir/install.sh; then 
     1482    ac_aux_dir=$ac_dir 
     1483    ac_install_sh="$ac_aux_dir/install.sh -c" 
     1484    break 
     1485  elif test -f $ac_dir/shtool; then 
     1486    ac_aux_dir=$ac_dir 
     1487    ac_install_sh="$ac_aux_dir/shtool install -c" 
     1488    break 
     1489  fi 
     1490done 
     1491if test -z "$ac_aux_dir"; then 
     1492  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 
     1493echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 
     1494   { (exit 1); exit 1; }; } 
     1495fi 
     1496ac_config_guess="$SHELL $ac_aux_dir/config.guess" 
     1497ac_config_sub="$SHELL $ac_aux_dir/config.sub" 
     1498ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. 
     1499 
     1500# Make sure we can run config.sub. 
     1501$ac_config_sub sun4 >/dev/null 2>&1 || 
     1502  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 
     1503echo "$as_me: error: cannot run $ac_config_sub" >&2;} 
     1504   { (exit 1); exit 1; }; } 
     1505 
     1506echo "$as_me:$LINENO: checking build system type" >&5 
     1507echo $ECHO_N "checking build system type... $ECHO_C" >&6 
     1508if test "${ac_cv_build+set}" = set; then 
     1509  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1510else 
     1511  ac_cv_build_alias=$build_alias 
     1512test -z "$ac_cv_build_alias" && 
     1513  ac_cv_build_alias=`$ac_config_guess` 
     1514test -z "$ac_cv_build_alias" && 
     1515  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 
     1516echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 
     1517   { (exit 1); exit 1; }; } 
     1518ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 
     1519  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 
     1520echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} 
     1521   { (exit 1); exit 1; }; } 
     1522 
     1523fi 
     1524echo "$as_me:$LINENO: result: $ac_cv_build" >&5 
     1525echo "${ECHO_T}$ac_cv_build" >&6 
     1526build=$ac_cv_build 
     1527build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 
     1528build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 
     1529build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 
     1530 
     1531 
     1532echo "$as_me:$LINENO: checking host system type" >&5 
     1533echo $ECHO_N "checking host system type... $ECHO_C" >&6 
     1534if test "${ac_cv_host+set}" = set; then 
     1535  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1536else 
     1537  ac_cv_host_alias=$host_alias 
     1538test -z "$ac_cv_host_alias" && 
     1539  ac_cv_host_alias=$ac_cv_build_alias 
     1540ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 
     1541  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 
     1542echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 
     1543   { (exit 1); exit 1; }; } 
     1544 
     1545fi 
     1546echo "$as_me:$LINENO: result: $ac_cv_host" >&5 
     1547echo "${ECHO_T}$ac_cv_host" >&6 
     1548host=$ac_cv_host 
     1549host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 
     1550host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 
     1551host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 
     1552 
     1553 
     1554echo "$as_me:$LINENO: checking target system type" >&5 
     1555echo $ECHO_N "checking target system type... $ECHO_C" >&6 
     1556if test "${ac_cv_target+set}" = set; then 
     1557  echo $ECHO_N "(cached) $ECHO_C" >&6 
     1558else 
     1559  ac_cv_target_alias=$target_alias 
     1560test "x$ac_cv_target_alias" = "x" && 
     1561  ac_cv_target_alias=$ac_cv_host_alias 
     1562ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 
     1563  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 
     1564echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 
     1565   { (exit 1); exit 1; }; } 
     1566 
     1567fi 
     1568echo "$as_me:$LINENO: result: $ac_cv_target" >&5 
     1569echo "${ECHO_T}$ac_cv_target" >&6 
     1570target=$ac_cv_target 
     1571target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 
     1572target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 
     1573target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 
     1574 
     1575 
     1576# The aliases save the names the user supplied, while $host etc. 
     1577# will get canonicalized. 
     1578test -n "$target_alias" && 
     1579  test "$program_prefix$program_suffix$program_transform_name" = \ 
     1580    NONENONEs,x,x, && 
     1581  program_prefix=${target_alias}- 
     1582 
    14731583          ac_config_headers="$ac_config_headers config.h" 
    14741584 
     
    15011611echo "${ECHO_T}no" >&6 
    15021612  SET_MAKE="MAKE=${MAKE-make}" 
     1613fi 
     1614 
     1615 
     1616echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5 
     1617echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6 
     1618arch_64bit=no 
     1619case "$host_cpu" in 
     1620x86_64) arch_64bit=yes ;; 
     1621esac 
     1622 
     1623if test "$arch_64bit" = yes; then 
     1624  echo "$as_me:$LINENO: result: yes" >&5 
     1625echo "${ECHO_T}yes" >&6 
     1626  if test -z "$COMPAT32BITFLAGS" ; then 
     1627    COMPAT32BITFLAGS="-m32" 
     1628  fi 
     1629else 
     1630  echo "$as_me:$LINENO: result: no" >&5 
     1631echo "${ECHO_T}no" >&6 
     1632  if test -z "$COMPAT32BITFLAGS" ; then 
     1633    COMPAT32BITFLAGS= 
     1634  fi 
    15031635fi 
    15041636 
     
    28102942  enable_fast_install=yes 
    28112943fi; 
    2812 ac_aux_dir= 
    2813 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do 
    2814   if test -f $ac_dir/install-sh; then 
    2815     ac_aux_dir=$ac_dir 
    2816     ac_install_sh="$ac_aux_dir/install-sh -c" 
    2817     break 
    2818   elif test -f $ac_dir/install.sh; then 
    2819     ac_aux_dir=$ac_dir 
    2820     ac_install_sh="$ac_aux_dir/install.sh -c" 
    2821     break 
    2822   elif test -f $ac_dir/shtool; then 
    2823     ac_aux_dir=$ac_dir 
    2824     ac_install_sh="$ac_aux_dir/shtool install -c" 
    2825     break 
    2826   fi 
    2827 done 
    2828 if test -z "$ac_aux_dir"; then 
    2829   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 
    2830 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 
    2831    { (exit 1); exit 1; }; } 
    2832 fi 
    2833 ac_config_guess="$SHELL $ac_aux_dir/config.guess" 
    2834 ac_config_sub="$SHELL $ac_aux_dir/config.sub" 
    2835 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. 
    2836  
    2837 # Make sure we can run config.sub. 
    2838 $ac_config_sub sun4 >/dev/null 2>&1 || 
    2839   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 
    2840 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 
    2841    { (exit 1); exit 1; }; } 
    2842  
    2843 echo "$as_me:$LINENO: checking build system type" >&5 
    2844 echo $ECHO_N "checking build system type... $ECHO_C" >&6 
    2845 if test "${ac_cv_build+set}" = set; then 
    2846   echo $ECHO_N "(cached) $ECHO_C" >&6 
    2847 else 
    2848   ac_cv_build_alias=$build_alias 
    2849 test -z "$ac_cv_build_alias" && 
    2850   ac_cv_build_alias=`$ac_config_guess` 
    2851 test -z "$ac_cv_build_alias" && 
    2852   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 
    2853 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 
    2854    { (exit 1); exit 1; }; } 
    2855 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 
    2856   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 
    2857 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} 
    2858    { (exit 1); exit 1; }; } 
    2859  
    2860 fi 
    2861 echo "$as_me:$LINENO: result: $ac_cv_build" >&5 
    2862 echo "${ECHO_T}$ac_cv_build" >&6 
    2863 build=$ac_cv_build 
    2864 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 
    2865 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 
    2866 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 
    2867  
    2868  
    2869 echo "$as_me:$LINENO: checking host system type" >&5 
    2870 echo $ECHO_N "checking host system type... $ECHO_C" >&6 
    2871 if test "${ac_cv_host+set}" = set; then 
    2872   echo $ECHO_N "(cached) $ECHO_C" >&6 
    2873 else 
    2874   ac_cv_host_alias=$host_alias 
    2875 test -z "$ac_cv_host_alias" && 
    2876   ac_cv_host_alias=$ac_cv_build_alias 
    2877 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 
    2878   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 
    2879 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 
    2880    { (exit 1); exit 1; }; } 
    2881  
    2882 fi 
    2883 echo "$as_me:$LINENO: result: $ac_cv_host" >&5 
    2884 echo "${ECHO_T}$ac_cv_host" >&6 
    2885 host=$ac_cv_host 
    2886 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 
    2887 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 
    2888 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 
    2889  
    2890  
    28912944# Find the correct PATH separator.  Usually this is `:', but 
    28922945# DJGPP uses `;' like DOS. 
     
    42424295*-*-irix6*) 
    42434296  # Find out which ABI we are using. 
    4244   echo '#line 4244 "configure"' > conftest.$ac_ext 
     4297  echo '#line 4297 "configure"' > conftest.$ac_ext 
    42454298  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 
    42464299  (eval $ac_compile) 2>&5 
     
    48004853CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" 
    48014854compiler_c_o=no 
    4802 if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then 
     4855if { (eval echo configure:4855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then 
    48034856  # The compiler can only warn and ignore the option if not recognized 
    48044857  # So say no if there are warnings 
     
    67186771  lt_status=$lt_dlunknown 
    67196772  cat > conftest.$ac_ext <<EOF 
    6720 #line 6720 "configure" 
     6773#line 6773 "configure" 
    67216774#include "confdefs.h" 
    67226775 
     
    68166869  lt_status=$lt_dlunknown 
    68176870  cat > conftest.$ac_ext <<EOF 
    6818 #line 6818 "configure" 
     6871#line 6871 "configure" 
    68196872#include "confdefs.h" 
    68206873 
     
    91459198s,@LIBS@,$LIBS,;t t 
    91469199s,@VERSION@,$VERSION,;t t 
     9200s,@build@,$build,;t t 
     9201s,@build_cpu@,$build_cpu,;t t 
     9202s,@build_vendor@,$build_vendor,;t t 
     9203s,@build_os@,$build_os,;t t 
     9204s,@host@,$host,;t t 
     9205s,@host_cpu@,$host_cpu,;t t 
     9206s,@host_vendor@,$host_vendor,;t t 
     9207s,@host_os@,$host_os,;t t 
     9208s,@target@,$target,;t t 
     9209s,@target_cpu@,$target_cpu,;t t 
     9210s,@target_vendor@,$target_vendor,;t t 
     9211s,@target_os@,$target_os,;t t 
    91479212s,@SET_MAKE@,$SET_MAKE,;t t 
     9213s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t 
    91489214s,@UNICODE_VERSION@,$UNICODE_VERSION,;t t 
    91499215s,@CC@,$CC,;t t 
     
    91569222s,@CPP@,$CPP,;t t 
    91579223s,@EGREP@,$EGREP,;t t 
    9158 s,@build@,$build,;t t 
    9159 s,@build_cpu@,$build_cpu,;t t 
    9160 s,@build_vendor@,$build_vendor,;t t 
    9161 s,@build_os@,$build_os,;t t 
    9162 s,@host@,$host,;t t 
    9163 s,@host_cpu@,$host_cpu,;t t 
    9164 s,@host_vendor@,$host_vendor,;t t 
    9165 s,@host_os@,$host_os,;t t 
    91669224s,@LN_S@,$LN_S,;t t 
    91679225s,@ECHO@,$ECHO,;t t 
  • indexers/trunk/packages/unac/configure.ac

    r13670 r15562  
    2121AC_PREREQ(2.13) 
    2222 
     23 
     24dnl get $target_cpu, $target_vendor, and $target_os 
     25dnl (as well as host_*) 
     26AC_CANONICAL_SYSTEM 
     27 
    2328AC_CONFIG_HEADER(config.h) 
    2429 
    2530AC_PROG_MAKE_SET 
     31 
     32AC_MSG_CHECKING(to see if architecture is 64-bit) 
     33arch_64bit=no 
     34case "$host_cpu" in 
     35x86_64) arch_64bit=yes ;; 
     36esac 
     37 
     38if test "$arch_64bit" = yes; then 
     39  AC_MSG_RESULT(yes) 
     40  if test -z "$COMPAT32BITFLAGS" ; then 
     41    COMPAT32BITFLAGS="-m32" 
     42  fi 
     43else 
     44  AC_MSG_RESULT(no) 
     45  if test -z "$COMPAT32BITFLAGS" ; then 
     46    COMPAT32BITFLAGS= 
     47  fi 
     48fi 
     49AC_SUBST(COMPAT32BITFLAGS) 
    2650 
    2751dnl