← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2008-07-02 15:15:08 UTC
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: monty@inaugust.com-20080702151508-6uoftlu175nvindy
Made everything use AS_HELP_STRING (except for charsets, which are dying anyway)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
449
449
  fi
450
450
fi
451
451
 
452
 
AC_ARG_WITH(server-suffix,
453
 
    [  --with-server-suffix    Append value to the version string.],
 
452
AC_ARG_WITH([server-suffix],
 
453
    [AS_HELP_STRING([--with-server-suffix],
 
454
      [Append value to the version string.])],
454
455
    [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],
455
456
    [ MYSQL_SERVER_SUFFIX= ]
456
457
    )
457
458
AC_SUBST(MYSQL_SERVER_SUFFIX)
458
459
 
459
460
# Force use of a curses libs
460
 
AC_ARG_WITH(named-curses-libs,
461
 
    [  --with-named-curses-libs=ARG
462
 
                          Use specified curses libraries instead of 
463
 
                          those automatically found by configure.],
 
461
AC_ARG_WITH([named-curses-libs],
 
462
    [AS_HELP_STRING([--with-named-curses-libs=ARG],
 
463
            [Use specified curses libraries instead of those
 
464
                automatically found by configure.])],
464
465
    [ with_named_curses=$withval ],
465
466
    [ with_named_curses=no ]
466
467
    )
467
468
 
468
469
# compile with strings functions in assembler
469
 
AC_ARG_ENABLE(assembler,
470
 
    [  --enable-assembler      Use assembler versions of some string 
471
 
                          functions if available.],
 
470
AC_ARG_ENABLE([assembler],
 
471
    [AS_HELP_STRING([--enable-assembler],
 
472
            [Use assembler versions of some string functions if available.])],
472
473
    [ ENABLE_ASSEMBLER=$enableval ],
473
474
    [ ENABLE_ASSEMBLER=no ]
474
475
    )
489
490
 
490
491
# Add query profiler
491
492
AC_MSG_CHECKING(if SHOW PROFILE should be enabled.)
492
 
AC_ARG_ENABLE(profiling,
493
 
    AS_HELP_STRING([--enable-profiling], [Build a version with query profiling code (req. community-features)]),
 
493
AC_ARG_ENABLE([profiling],
 
494
    [AS_HELP_STRING([--enable-profiling], 
 
495
            [Build a version with query profiling code])],
494
496
    [ ENABLED_PROFILING=$enableval ],
495
497
    [ ENABLED_PROFILING=no ])
496
498
 
503
505
  AC_MSG_RESULT([no])
504
506
fi
505
507
 
506
 
AC_ARG_WITH(tcp-port,
507
 
    [  --with-tcp-port=port-number
508
 
                          Which port to use for MySQL services (default 3306)],
 
508
AC_ARG_WITH([tcp-port],
 
509
    [AS_HELP_STRING([--with-tcp-port=port-number],
 
510
            [Which port to use for MySQL services @<:@default=3306@:>@])],
509
511
    [ MYSQL_TCP_PORT=$withval ],
510
512
    [ MYSQL_TCP_PORT=$MYSQL_TCP_PORT_DEFAULT
511
513
      # if we actually defaulted (as opposed to the pathological case of
541
543
AC_SUBST(MYSQL_TCP_PORT_DEFAULT)
542
544
 
543
545
# Use this to set the place used for unix socket used to local communication.
544
 
AC_ARG_WITH(mysqld-user,
545
 
    [  --with-mysqld-user=username   
546
 
                          What user the mysqld daemon shall be run as.],
 
546
AC_ARG_WITH([mysqld-user],
 
547
    [AS_HELP_STRING([--with-mysqld-user=username],
 
548
            [What user the mysqld daemon shall be run as.
 
549
                @<:@default=mysql@:>@])],
547
550
    [ MYSQLD_USER=$withval ],
548
551
    [ MYSQLD_USER=mysql ]
549
552
    )
697
700
  DEBUG_OPTIMIZE_CXX=""
698
701
fi
699
702
 
700
 
AC_ARG_WITH(debug,
701
 
    [  --with-debug            Add debug code
702
 
  --with-debug=full       Add debug code (adds memory checker, very slow)],
 
703
AC_ARG_WITH([debug],
 
704
    [AS_HELP_STRING([--with-debug],
 
705
            [Add debug code (yes|no|full) @<:@default=no@:>@ 
 
706
            Full adds memory checked, very slow.])],
703
707
    [with_debug=$withval],
704
708
    [with_debug=no])
705
709
if test "$with_debug" = "yes"
716
720
  CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS"
717
721
else
718
722
  # Optimized version. No debug
719
 
  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
 
723
  AC_DEFINE([DBUG_OFF], [1], [Dont use libdbug])
720
724
  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
721
725
  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
722
726
fi
723
727
 
724
728
# If we should allow error injection tests
725
 
AC_ARG_WITH(error-inject,
726
 
    AS_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
 
729
AC_ARG_WITH([error-inject],
 
730
    [AS_HELP_STRING([--with-error-inject],
 
731
            [Enable error injection in MySQL Server @<:@default=off@:>@])],
727
732
    [ with_error_inject=$withval ],
728
733
    [ with_error_inject=no ])
729
734
 
737
742
fi
738
743
 
739
744
AC_ARG_WITH([fast-mutexes],
740
 
            AS_HELP_STRING([--with-fast-mutexes],[Compile with fast mutexes (default is disabled)]),
741
 
            [with_fast_mutexes=$withval], [with_fast_mutexes=no])
 
745
    [AS_HELP_STRING([--with-fast-mutexes],
 
746
            [Compile with fast mutexes  @<:@default=off@:>@])],
 
747
    [with_fast_mutexes=$withval],
 
748
    [with_fast_mutexes=no])
742
749
 
743
750
if test "$with_fast_mutexes" != "no"
744
751
then
751
758
  fi
752
759
fi
753
760
 
754
 
AC_ARG_WITH(comment,
755
 
    [  --with-comment          Comment about compilation environment.],
 
761
AC_ARG_WITH([comment],
 
762
    [AS_HELP_STRING([--with-comment],
 
763
            [Comment about compilation environment. @<:@default=off@:>@])],
756
764
    [with_comment=$withval],
757
765
    [with_comment=no])
758
766
if test "$with_comment" != "no"