Commit 5990c191 authored by jcole@mugatu.spaceapes.com's avatar jcole@mugatu.spaceapes.com
Browse files

Aesthetic cleanups to acinclude.m4 and configure.in.

parent 54b0d014

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ AC_MSG_CHECKING(for OpenSSL) 


AC_DEFUN(MYSQL_CHECK_MYSQLFS, [

  AC_ARG_WITH([mysqlfs],

              [\

              [

  --with-mysqlfs          Include the corba-based MySQL file system],

              [mysqlfs="$withval"],

              [mysqlfs=no])
@@ -821,7 +821,7 @@ AC_SUBST(orbit_idl) 
])



AC_DEFUN([MYSQL_CHECK_ISAM], [

  AC_ARG_WITH([isam], [\

  AC_ARG_WITH([isam], [

  --without-isam          Disable the ISAM table type],

    [with_isam="$withval"],

    [with_isam=yes])

configure.in

+19 −12
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ AC_PATH_PROG(HOSTNAME, hostname, hostname) 
# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and

# fall back to 'tar' otherwise and hope that it's a GNU tar as well

AC_CHECK_PROGS(TAR, gnutar gtar tar)



dnl We use a path for perl so the script startup works

dnl We make sure to use perl, not perl5, in hopes that the RPMs will

dnl not depend on the perl5 binary being installed (probably a bug in RPM)
@@ -453,7 +454,11 @@ fi 
NOINST_LDFLAGS=



AC_ARG_WITH(other-libc,

 [ --with-other-libc=/path/to/other/libc/dir Link against libc and other standard libraries installed in the specified non-standard location overriding default. Originally added to be able to link against glibc 2.2 without making the user upgrade the standard libc installation ],

 [  --with-other-libc=DIR   Link against libc and other standard libraries 

                          installed in the specified non-standard location 

                          overriding default. Originally added to be able to

                          link against glibc 2.2 without making the user 

                          upgrade the standard libc installation.],

 [

   other_libc_include="$withval/include"

   other_libc_lib="$withval/lib"
@@ -504,7 +509,6 @@ AC_SUBST(NOINST_LDFLAGS) 


AC_ARG_WITH(server-suffix,

    [  --with-server-suffix    Append value to the version string.],

    # I heard that 'cut' isn't portable.  Isn't there a better way?

    [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],

    [ MYSQL_SERVER_SUFFIX= ]

    )
@@ -629,11 +633,10 @@ AC_ARG_WITH(mysqld-user, 
    )

AC_SUBST(MYSQLD_USER)



# If we should allove LOAD DATA LOCAL

# If we should allow LOAD DATA LOCAL

AC_MSG_CHECKING(if we should should enable LOAD DATA LOCAL by default)

AC_ARG_ENABLE(local-infile,

    [  --enable-local-infile

                          Enable LOAD DATA LOCAL INFILE (default: disabled)],

    [  --enable-local-infile   Enable LOAD DATA LOCAL INFILE (default: disabled)],

    [ ENABLED_LOCAL_INFILE=$enableval ],

    [ ENABLED_LOCAL_INFILE=no ]

    )
@@ -993,9 +996,9 @@ then 
      if test "$IS_LINUX" = "true"

      then

	AC_MSG_ERROR([This is a linux system and Linuxthreads was not

found. On linux Linuxthreads should be used. So install Linuxthreads

found. On linux Linuxthreads should be used.  Please install Linuxthreads

(or a new glibc) and try again.  See the Installation chapter in the

Reference Manual.])

Reference Manual for more information.])

      else

	AC_MSG_CHECKING("DEC threads")

        if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
@@ -1353,6 +1356,7 @@ else 
  DEBUG_OPTIMIZE_CXX=""

  OPTIMIZE_CXXFLAGS="-O"

fi



AC_ARG_WITH(debug,

    [  --without-debug         Build a production version without debugging code],

    [with_debug=$withval],
@@ -1736,7 +1740,7 @@ then 
  AC_DEFINE(HAVE_READDIR_R)

fi



# Check definition av posix sigwait()

# Check definition of posix sigwait()

AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,

AC_TRY_LINK(

[#if !defined(SCO) && !defined(__osf__)
@@ -1759,7 +1763,7 @@ fi 
if test "$mysql_cv_sigwait" != "POSIX"

then

unset mysql_cv_sigwait

# Check definition av posix sigwait()

# Check definition of posix sigwait()

AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,

AC_TRY_LINK(

[#if !defined(SCO) && !defined(__osf__)
@@ -1937,8 +1941,11 @@ CHARSETS_DEPRECATED="win1251" 
DEFAULT_CHARSET=latin1

AC_DIVERT_POP



dnl fix this later..

dnl  [  --with-charset=CHARSET  Use CHARSET by default (one of: $CHARSETS_AVAILABLE; Default is $DEFAULT_CHARSET)],



AC_ARG_WITH(charset,

  [  --with-charset=CHARSET  Use CHARSET by default (one of: $CHARSETS_AVAILABLE; Default is $DEFAULT_CHARSET)],

  [  --with-charset=CHARSET  Use CHARSET by default (Default is latin1)],

  [default_charset="$withval"],

  [default_charset="$DEFAULT_CHARSET"])