← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2008-08-12 03:32:29 UTC
  • mfrom: (287.3.35 codestyle)
  • Revision ID: brian@tangent.org-20080812033229-81qdkltou321w1gv
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
255
255
then
256
256
  case "$host_cpu" in
257
257
    *ppc* | *powerpc*)
258
 
      CFLAGS="$CFLAGS -mno-fused-madd"
259
 
      CXXFLAGS="$CXXFLAGS -mno-fused-madd"
 
258
      AM_CFLAGS="$CFLAGS -mno-fused-madd"
 
259
      AM_CXXFLAGS="$CXXFLAGS -mno-fused-madd"
260
260
    ;;
261
261
  esac
262
262
fi
275
275
if test "$GCC" = "yes"
276
276
then
277
277
  # Disable exceptions as they seams to create problems with gcc and threads.
278
 
  # (splitting this is for the future...)
279
 
  NO_EXCEPTIONS="-fno-exceptions"
280
 
  AC_SUBST(NO_EXCEPTIONS)
281
278
  # drizzled doesn't use run-time-type-checking, so we disable it.
282
 
  CXXFLAGS="$CXXFLAGS ${NO_EXCEPTIONS} -fno-rtti"
 
279
  AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti"
283
280
fi
284
281
 
285
282
MYSQL_PROG_AR
290
287
fi
291
288
AC_SUBST(LD_VERSION_SCRIPT)
292
289
 
 
290
#--------------------------------------------------------------------
 
291
# Check for Google Proto Buffers
 
292
#--------------------------------------------------------------------
 
293
 
 
294
AC_LANG_PUSH([C++])
 
295
AC_CHECK_HEADERS([google/protobuf/message.h])
 
296
if test "x$ac_cv_header_google_protobuf_message_h" != "xyes"
 
297
then
 
298
  AC_MSG_ERROR([Couldn't find message.h. Try installing Google Protocol Buffer development packages])
 
299
fi
 
300
 
 
301
save_CFLAGS="$CFLAGS"
 
302
save_LIBS="$LIBS"
 
303
CFLAGS=""
 
304
LIBS="-lprotobuf"
 
305
 
 
306
AC_CACHE_CHECK([for Message in libprotobuf], ac_libprotobuf_works, [
 
307
  AC_TRY_LINK([
 
308
#include <google/protobuf/descriptor.pb.h>
 
309
  ],[
 
310
    google::protobuf::FileDescriptorProto testFdp;
 
311
  ], ac_libprotobuf_works=yes, [
 
312
        AC_ERROR([could not find Google's libprotobuf])
 
313
  ])
 
314
 
 
315
])
 
316
 
 
317
PROTOBUF_LIBS="${LIBS}"
 
318
AC_SUBST(PROTOBUF_LIBS)
 
319
CFLAGS="$save_CFLAGS"
 
320
LIBS="$save_LIBS"
 
321
AC_LANG_POP()
293
322
 
294
323
#--------------------------------------------------------------------
295
324
# Check for libevent
434
463
LIBS="$my_save_LIBS"
435
464
AC_SUBST(READLINE_LIBS)
436
465
 
 
466
 
437
467
#--------------------------------------------------------------------
438
468
# Check for libpcre
439
469
#--------------------------------------------------------------------
1360
1390
  GCC_WARNINGS="${C99_SUPPORT_HACK} ${BASE_WARNINGS} ${GCC_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1361
1391
  GXX_WARNINGS="${BASE_WARNINGS} ${GXX_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1362
1392
 
1363
 
  AM_CXXFLAGS="${GXX_WARNINGS}"
1364
 
  AM_CFLAGS="${GCC_WARNINGS} "
 
1393
  AM_CXXFLAGS="${GXX_WARNINGS} ${AM_CXXFLAGS}"
 
1394
  AM_CFLAGS="${GCC_WARNINGS} ${AM_CFLAGS}"
1365
1395
fi
1366
1396
 
1367
1397
AC_SUBST([GLOBAL_CPPFLAGS],['-I$(top_srcdir) -I$(top_builddir)'])
1402
1432
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
1403
1433
 
1404
1434
# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
1405
 
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")
 
1435
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS' AM_CFLAGS='$AM_CFLAGS' AM_CXXFLAGS='$AM_CXXFLAGS'")
1406
1436
 
1407
1437
AC_OUTPUT