~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-03-18 22:05:31 UTC
  • mto: (950.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 943.
  • Revision ID: mordred@inaugust.com-20090318220531-sjnli9qtlw9pee8i
Cleaned up 64-bit detection on Solaris.

Show diffs side-by-side

added added

removed removed

Lines of Context:
251
251
then
252
252
  dnl we put CPPFLAGS and LDFLAGS first here, because if the user has specified
253
253
  dnl command line CPPFLAGS or LDFLAGS, their -I or -L should come _first_
254
 
  isainfo_k=`isainfo -k`
255
254
  if test "$target_cpu" = "sparc"
256
255
  then
257
256
    MEMALIGN_FLAGS="-xmemalign=8s"
 
257
  fi
 
258
 
 
259
  isainfo_b=`isainfo -b`
 
260
  if test "$isainfo_b" = "64"
 
261
  then
258
262
    IS_64="-m64"
259
 
  else
260
 
    if test "$isainfo_k" = "amd64"
261
 
    then
262
 
      IS_64="-m64"
263
 
    fi
264
263
  fi
265
 
  LDFLAGS="${LDFLAGS} -L/usr/local/lib/${isainfo_k} -L/usr/local/lib -L/opt/csw/lib/${isainfo_k} -L/opt/csw/lib -L/usr/lib/${isainfo_k}"
 
264
  LDFLAGS="${LDFLAGS} -L/usr/local/lib/${isainfo_b} -L/usr/local/lib -L/opt/csw/lib/${isainfo_b} -L/opt/csw/lib -L/usr/lib/${isainfo_b}"
266
265
  CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/csw/include"
267
266
 
268
267
  CXXFLAGS="-xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS} ${CXXFLAGS}"