← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-03-09 23:11:15 UTC
  • mto: (923.2.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 928.
  • Revision ID: mordred@inaugust.com-20090309231115-limmpu5v5y4sm9lo
Fixed the latest stuff on Solaris.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
116
116
m4_include(m4/character_sets.m4)
117
117
AC_SUBST(AVAILABLE_LANGUAGES)
118
118
 
119
 
m4_include(m4/gettext.m4)
120
 
AM_GNU_GETTEXT(external, need-formatstring-macros)
121
 
if test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:"
122
 
then
123
 
  AM_PATH_PROG_WITH_TEST(GMSGMERGE, gmsgmerge,
124
 
    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
125
 
  MSGMERGE="${GMSGMERGE}"
126
 
fi
127
 
AM_CONDITIONAL([BUILD_GETTEXT],[test "x$MSGMERGE" != "x" -a "x$MSGMERGE" != "x:"])
128
 
 
129
119
 
130
120
# Set this for plugins to use
131
121
ac_build_drizzle="yes"
259
249
fi
260
250
if test "$SUNCC" = "yes"
261
251
then
 
252
  dnl we put CPPFLAGS and LDFLAGS first here, because if the user has specified
 
253
  dnl command line CPPFLAGS or LDFLAGS, their -I or -L should come _first_
262
254
  isainfo_k=`isainfo -k`
263
255
  if test "$target_cpu" = "sparc"
264
256
  then
265
257
    MEMALIGN_FLAGS="-xmemalign=8s"
266
258
    IS_64="-m64"
267
 
    LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
268
259
  else
269
260
    if test "$isainfo_k" = "amd64"
270
261
    then
271
262
      IS_64="-m64"
272
 
      LDFLAGS="-L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
273
263
    fi
274
264
  fi
275
 
  CPPFLAGS="-I/usr/local/include -I/opt/csw/include ${CPPFLAGS}"
 
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}"
 
266
  CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/csw/include"
276
267
 
277
268
  CXXFLAGS="-xlang=c99 -g -mt -compat=5 -library=stlport4 -template=no%extdef ${IS_64} ${MEMALIGN_FLAGS} ${CXXFLAGS}"
278
269
  CFLAGS="-g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS} ${CFLAGS}"
287
278
 
288
279
fi
289
280
 
 
281
m4_include(m4/gettext.m4)
 
282
AM_GNU_GETTEXT(external, need-formatstring-macros)
 
283
if test "x$MSGMERGE" = "x" -o "x$MSGMERGE" = "x:"
 
284
then
 
285
  AM_PATH_PROG_WITH_TEST(GMSGMERGE, gmsgmerge,
 
286
    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
 
287
  MSGMERGE="${GMSGMERGE}"
 
288
fi
 
289
AM_CONDITIONAL([BUILD_GETTEXT],[test "x$MSGMERGE" != "x" -a "x$MSGMERGE" != "x:"])
 
290
 
 
291
 
290
292
# We use libtool
291
293
AC_PROG_LIBTOOL
292
294