← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: devananda
  • Date: 2009-06-30 14:27:54 UTC
  • mfrom: (1030.2.4 trunk)
  • mto: (1093.1.7 captain)
  • mto: This revision was merged to the branch mainline in revision 1095.
  • Revision ID: devananda.vdv@gmail.com-20090630142754-vm9w374yxkf1pikc
merge from lp

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
122
122
 
123
123
AC_DEFINE([_BACKWARD_BACKWARD_WARNING_H],[1],[Hack to disable deprecation warning in gcc])
124
124
 
125
 
# The port should be constant for a LONG time
 
125
# The port that was assigned by IANA.
126
126
DRIZZLE_TCP_PORT_DEFAULT=4427
127
127
 
128
128
m4_include(m4/dtrace.m4)
355
355
#--------------------------------------------------------------------
356
356
 
357
357
AC_LANG_PUSH([C++])
358
 
AC_LIB_HAVE_LINKFLAGS(protobuf,,
 
358
AC_LIB_HAVE_LINKFLAGS(protobuf,pthread,
359
359
[#include <google/protobuf/descriptor.h>
360
360
],
361
361
[google::protobuf::FileDescriptor* file;],system)
675
675
 
676
676
AC_ARG_WITH([tcp-port],
677
677
    [AS_HELP_STRING([--with-tcp-port=port-number],
678
 
            [Which port to use for Drizzle services @<:@default=4427@:>@])],
 
678
            [Which port to use for Drizzle TCP services @<:@default=4427@:>@])],
679
679
    [ DRIZZLE_TCP_PORT=$withval ],
680
680
    [ DRIZZLE_TCP_PORT=$DRIZZLE_TCP_PORT_DEFAULT
681
681
      # if we actually defaulted (as opposed to the pathological case of
706
706
      # so don't mess with that.
707
707
      DRIZZLE_TCP_PORT_DEFAULT=0 ]
708
708
    )
 
709
 
709
710
AC_SUBST(DRIZZLE_TCP_PORT)
710
 
# We might want to document the assigned port in the manual.
711
711
AC_SUBST(DRIZZLE_TCP_PORT_DEFAULT)
712
 
AC_DEFINE_UNQUOTED([DRIZZLE_PORT],[$DRIZZLE_TCP_PORT],
 
712
AC_DEFINE_UNQUOTED([DRIZZLE_TCP_PORT],[$DRIZZLE_TCP_PORT],
713
713
                   [Drizzle port to use])
714
 
AC_DEFINE_UNQUOTED([DRIZZLE_PORT_DEFAULT],[$DRIZZLE_TCP_PORT_DEFAULT],
715
 
                   [If we defaulted to DRIZZLE_PORT, then this will be zero])
 
714
AC_DEFINE_UNQUOTED([DRIZZLE_TCP_PORT_DEFAULT],[$DRIZZLE_TCP_PORT_DEFAULT],
 
715
                   [If we defaulted to DRIZZLE_PORT, then this will be zero])
 
716
 
716
717
 
717
718
# Use this to set the place used for unix socket used to local communication.
718
719
AC_ARG_WITH([drizzled-user],