← Back to branch summary

~lifeless/debian/sid/pandora-build/debian

« back to all changes in this revision

Viewing changes to m4/pandora_64bit.m4

  • Committer: Monty Taylor
  • Date: 2009-07-29 18:42:11 UTC
  • Revision ID: mordred@inaugust.com-20090729184211-78bxy92wcef9d9s5
Incorporated Eric's changes for disable-able libs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_64bit.m4
9
9
AC_DEFUN([PANDORA_64BIT],[
10
10
  AC_BEFORE([$0], [AC_LIB_PREFIX])
11
11
 
12
 
 
13
 
  AC_ARG_ENABLE([64bit],[
14
 
    AS_HELP_STRING([--disable-64bit],
 
12
  AC_ARG_ENABLE([64bit],
 
13
    [AS_HELP_STRING([--disable-64bit],
15
14
      [Build 64 bit binary @<:@default=on@:>@])],
16
 
             [ac_enable_64bit="$enableval"],
17
 
             [ac_enable_64bit="yes"])
 
15
    [ac_enable_64bit="$enableval"],
 
16
    [ac_enable_64bit="yes"])
18
17
 
19
18
  AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
20
19
  AS_IF([test "x$ISAINFO" != "xno"],
26
25
    isainfo_k=`${ISAINFO} -k` 
27
26
    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_k}"
28
27
 
29
 
    AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
30
 
      LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
31
 
    ])
32
 
 
33
28
    AS_IF([test "x$ac_enable_64bit" = "xyes"],[
 
29
 
 
30
      AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
 
31
        LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
 
32
      ])
 
33
 
34
34
      AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
35
35
       dnl The user hasn't overridden the default libdir, so we'll 
36
36
       dnl the dir suffix to match solaris 32/64-bit policy