← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Jay Pipes
  • Date: 2009-08-20 17:27:08 UTC
  • mfrom: (1093.9.22 pandora-build)
  • mto: This revision was merged to the branch mainline in revision 1120.
  • Revision ID: jpipes@serialcoder-20090820172708-48n4zi60lviywqj7
Merge and resolve conflicts on pandora build fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
49
49
AM_CONDITIONAL(HAVE_LCOV,[test "x$LCOV" != "x"])
50
50
 
51
51
AC_CHECK_PROGS(YACC, ['bison -y'])
52
 
if test -z "$YACC" && test "$building_from_bzr" = "yes"
53
 
then
 
52
AS_IF([test "x$YACC" = "x" -a "$building_from_bzr" = "yes"],[
54
53
  AC_MSG_ERROR(["bison is required for Drizzle to build from a bzr branch"])
55
 
fi
 
54
])
56
55
 
57
56
 
58
57
AM_GNU_GETTEXT(external, need-formatstring-macros)
72
71
PANDORA_REQUIRE_PTHREAD
73
72
 
74
73
PANDORA_REQUIRE_LIBPROTOBUF
75
 
PANDORA_PROTOBUF_RECENT
 
74
PANDORA_PROTOBUF_REQUIRE_VERSION([2.0.3])
76
75
PANDORA_REQUIRE_PROTOC
77
76
 
78
77
#--------------------------------------------------------------------
655
654
 
656
655
DRIZZLE_CHECK_MAX_INDEXES
657
656
 
658
 
#--------------------------------------------------------------------
659
 
# Declare our plugin modules
660
 
# Has to be done late, as the plugin may need to check for existence of
661
 
# functions tested above
662
 
#--------------------------------------------------------------------
663
 
 
664
 
m4_include(config/plugin.ac)
665
 
dnl Add code here to read set plugin lists and  set drizzled_default_plugin_list
666
 
AC_DEFINE_UNQUOTED([DRIZZLED_PLUGIN_LIST],[$drizzled_default_plugin_list],
667
 
                   [List of plugins that should be loaded on startup if no
668
 
                    value is given for --plugin-load])
669
 
 
670
 
drizzled_builtin_list=`echo $drizzled_builtin_list | sed 's/, *$//'`
671
 
AC_DEFINE_UNQUOTED([DRIZZLED_BUILTIN_LIST],[$drizzled_builtin_list],
672
 
                   [List of plugins to be loaded in sql_builtin.cc])
673
 
AC_SUBST(drizzled_plugin_test_list)
674
 
AC_SUBST(drizzled_plugin_libs)
675
 
 
676
 
AC_SUBST(mysql_plugin_dirs)
677
 
AC_SUBST(mysql_plugin_libs)
678
 
drizzled_plugin_defs=`echo $drizzled_plugin_defs | sed 's/, *$//'`
679
 
AC_SUBST(drizzled_plugin_defs)
680
 
AC_SUBST(DRIZZLED_PLUGIN_DEP_LIBS)
681
 
 
682
 
dnl Must be done once we turn on warnings and such
683
 
AC_CACHE_CHECK(
684
 
  [whether __attribute__ visibility "hidden" is supported],
685
 
  [ac_cv_can_use_hidden_],[
686
 
    AC_LANG_PUSH(C++)
687
 
    save_CXXFLAGS="${CXXFLAGS}"
688
 
    CXXFLAGS="${AM_CXXFLAGS}"
689
 
    AC_LINK_IFELSE([
690
 
      AC_LANG_PROGRAM(
691
 
        [[
692
 
__attribute__((visibility ("hidden")))
693
 
void testme() {  }
694
 
        ]],[[testme()]]
695
 
      )],  
696
 
      [ac_cv_can_use_hidden_=yes],
697
 
      [ac_cv_can_use_hidden_=no])
698
 
    CXXFLAGS="${save_CXXFLAGS}"
699
 
    AC_LANG_POP()])
700
 
AS_IF([test "$ac_cv_can_use_hidden_" = "yes"],[
701
 
  AC_DEFINE(HAVE_ATTR_HIDDEN, 1,
702
 
  [Define to 1 if you have support for __attribute__((visibility("hidden")))])
703
 
])
704
 
 
705
 
 
706
 
AC_SUBST(pkgplugindir,"\$(pkglibdir)/plugin")
 
657
dnl Has to be done late, as the plugin may need to check for existence of
 
658
dnl functions tested above
 
659
PANDORA_PLUGINS
707
660
 
708
661
dnl GCC Precompiled Header Support
709
662
dnl re-enable later