Commit 3cf7acb7 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

- Applied required modifications for automake 1.5 

 - some additional small fixes
 - added "depcomp" for automake 1.5
parent 3aa161d2

acinclude.m4

+0 −565
Original line number Diff line number Diff line
@@ -1183,568 +1183,3 @@ dnl --------------------------------------------------------------------------- 


dnl ---------------------------------------------------------------------------

dnl Got this from the GNU tar 1.13.11 distribution

dnl by Paul Eggert <eggert@twinsun.com>

dnl ---------------------------------------------------------------------------



dnl By default, many hosts won't let programs access large files;

dnl one must use special compiler options to get large-file access to work.

dnl For more details about this brain damage please see:

dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html



dnl Written by Paul Eggert <eggert@twinsun.com>.



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)

AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,

  [AC_CACHE_CHECK([for $1 value to request large file support],

     ac_cv_sys_largefile_$1,

     [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2

      then

        ac_cv_sys_largefile_$1=`cat conftest.1`

      else

	ac_cv_sys_largefile_$1=no

	ifelse($1, CFLAGS,

	  [case "$host_os" in

	   # HP-UX 10.20 requires -D__STDC_EXT__ with gcc 2.95.1.

changequote(, )dnl

	   hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)

changequote([, ])dnl

	      if test "$GCC" = yes; then

	        if $CC -v 2>&1 | grep 'version 2.95' > /dev/null 2>&1; then

		  ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__

		fi

	      fi

	      ;;

	   # IRIX 6.2 and later require cc -n32.

changequote(, )dnl

	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)

changequote([, ])dnl

	     if test "$GCC" != yes; then

	       ac_cv_sys_largefile_CFLAGS=-n32

	     fi

	   esac

	   if test "$ac_cv_sys_largefile_CFLAGS" != no; then

	     ac_save_CC="$CC"

	     CC="$CC $ac_cv_sys_largefile_CFLAGS"

	     AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)

	     CC="$ac_save_CC"

	   fi])

      fi

      rm -f conftest*])])



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)

AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,

  [case $2 in

   no) ;;

   ?*)

     case "[$]$1" in

     '') $1=$2 ;;

     *) $1=[$]$1' '$2 ;;

     esac ;;

   esac])



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)

AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,

  [AC_CACHE_CHECK([for $1], $2,

     [$2=no

changequote(, )dnl

      $4

      for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do

	case "$ac_flag" in

	-D$1)

	  $2=1 ;;

	-D$1=*)

	  $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;

	esac

      done

changequote([, ])dnl

      ])

   if test "[$]$2" != no; then

     AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])

   fi])



AC_DEFUN(MYSQL_SYS_LARGEFILE,

  [AC_REQUIRE([AC_CANONICAL_HOST])

  AC_ARG_ENABLE(largefile,

     [  --disable-largefile     Omit support for large files])

   if test "$enable_largefile" != no; then

     AC_CHECK_TOOL(GETCONF, getconf)

     AC_SYS_LARGEFILE_FLAGS(CFLAGS)

     AC_SYS_LARGEFILE_FLAGS(LDFLAGS)

     AC_SYS_LARGEFILE_FLAGS(LIBS)



     for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do

       case "$ac_flag" in

       no) ;;

       -D_FILE_OFFSET_BITS=*) ;;

       -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;

       -D_LARGE_FILES | -D_LARGE_FILES=*) ;;

       -D?* | -I?*)

	 AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;

       *)

	 AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;

       esac

     done

     AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")

     AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")

     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,

       ac_cv_sys_file_offset_bits,

       [Number of bits in a file offset, on hosts where this is settable.],

       [case "$host_os" in

	# HP-UX 10.20 and later

	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)

	  ac_cv_sys_file_offset_bits=64 ;;

	esac])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,

       ac_cv_sys_largefile_source,

       [Define to make fseeko etc. visible, on some hosts.],

       [case "$host_os" in

	# HP-UX 10.20 and later

	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)

	  ac_cv_sys_largefile_source=1 ;;

	esac])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,

       ac_cv_sys_large_files,

       [Define for large files, on AIX-style hosts.],

       [case "$host_os" in

	# AIX 4.2 and later

	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)

	  ac_cv_sys_large_files=1 ;;

	esac])

   fi

  ])





## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-

## Copyright (C) 1996-1999 Free Software Foundation, Inc.

## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

##

## This program is free software; you can redistribute it and/or modify

## it under the terms of the GNU General Public License as published by

## the Free Software Foundation; either version 2 of the License, or

## (at your option) any later version.

##

## This program is distributed in the hope that it will be useful, but

## WITHOUT ANY WARRANTY; without even the implied warranty of

## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

## General Public License for more details.

##

## You should have received a copy of the GNU General Public License

## along with this program; if not, write to the Free Software

## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

##

## As a special exception to the GNU General Public License, if you

## distribute this file as part of a program that contains a

## configuration script generated by Autoconf, you may include it under

## the same distribution terms that you use for the rest of that program.



# serial 40 AC_PROG_LIBTOOL

AC_DEFUN(AC_PROG_LIBTOOL,

[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl



# Save cache, so that ltconfig can load it

AC_CACHE_SAVE



# Actually configure libtool.  ac_aux_dir is where install-sh is found.

CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \

LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \

LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \

DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \

${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \

$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \

|| AC_MSG_ERROR([libtool configure failed])



# Reload cache, that may have been modified by ltconfig

AC_CACHE_LOAD



# This can be used to rebuild libtool when needed

LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"



# Always use our own libtool.

LIBTOOL='$(SHELL) $(top_builddir)/libtool'

AC_SUBST(LIBTOOL)dnl



# Redirect the config.log output again, so that the ltconfig log is not

# clobbered by the next message.

exec 5>>./config.log

])



AC_DEFUN(AC_LIBTOOL_SETUP,

[AC_PREREQ(2.13)dnl

AC_REQUIRE([AC_ENABLE_SHARED])dnl

AC_REQUIRE([AC_ENABLE_STATIC])dnl

AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl

AC_REQUIRE([AC_CANONICAL_HOST])dnl

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

AC_REQUIRE([AC_PROG_RANLIB])dnl

AC_REQUIRE([AC_PROG_CC])dnl

AC_REQUIRE([AC_PROG_LD])dnl

AC_REQUIRE([AC_PROG_NM])dnl

AC_REQUIRE([AC_PROG_LN_S])dnl

dnl



case "$target" in

NONE) lt_target="$host" ;;

*) lt_target="$target" ;;

esac



# Check for any special flags to pass to ltconfig.

libtool_flags="--cache-file=$cache_file"

test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"

test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"

test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"

test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"

test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"

ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],

[libtool_flags="$libtool_flags --enable-dlopen"])

ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],

[libtool_flags="$libtool_flags --enable-win32-dll"])

AC_ARG_ENABLE(libtool-lock,

  [  --disable-libtool-lock  avoid locking (might break parallel builds)])

test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"

test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"



# Some flags need to be propagated to the compiler or linker for good

# libtool support.

case "$lt_target" in

*-*-irix6*)

  # Find out which ABI we are using.

  echo '[#]line __oline__ "configure"' > conftest.$ac_ext

  if AC_TRY_EVAL(ac_compile); then

    case "`/usr/bin/file conftest.o`" in

    *32-bit*)

      LD="${LD-ld} -32"

      ;;

    *N32*)

      LD="${LD-ld} -n32"

      ;;

    *64-bit*)

      LD="${LD-ld} -64"

      ;;

    esac

  fi

  rm -rf conftest*

  ;;



*-*-sco3.2v5*)

  # On SCO OpenServer 5, we need -belf to get full-featured binaries.

  SAVE_CFLAGS="$CFLAGS"

  CFLAGS="$CFLAGS -belf"

  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,

    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])

  if test x"$lt_cv_cc_needs_belf" != x"yes"; then

    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

    CFLAGS="$SAVE_CFLAGS"

  fi

  ;;



ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],

[*-*-cygwin* | *-*-mingw*)

  AC_CHECK_TOOL(DLLTOOL, dlltool, false)

  AC_CHECK_TOOL(AS, as, false)

  AC_CHECK_TOOL(OBJDUMP, objdump, false)

  ;;

])

esac

])



# AC_LIBTOOL_DLOPEN - enable checks for dlopen support

AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])



# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's

AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])



# AC_ENABLE_SHARED - implement the --enable-shared flag

# Usage: AC_ENABLE_SHARED[(DEFAULT)]

#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to

#   `yes'.

AC_DEFUN(AC_ENABLE_SHARED, [dnl

define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl

AC_ARG_ENABLE(shared,

changequote(<<, >>)dnl

<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],

changequote([, ])dnl

[p=${PACKAGE-default}

case "$enableval" in

yes) enable_shared=yes ;;

no) enable_shared=no ;;

*)

  enable_shared=no

  # Look at the argument we got.  We use all the common list separators.

  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"

  for pkg in $enableval; do

    if test "X$pkg" = "X$p"; then

      enable_shared=yes

    fi

  done

  IFS="$ac_save_ifs"

  ;;

esac],

enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl

])



# AC_DISABLE_SHARED - set the default shared flag to --disable-shared

AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl

AC_ENABLE_SHARED(no)])



# AC_ENABLE_STATIC - implement the --enable-static flag

# Usage: AC_ENABLE_STATIC[(DEFAULT)]

#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to

#   `yes'.

AC_DEFUN(AC_ENABLE_STATIC, [dnl

define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl

AC_ARG_ENABLE(static,

changequote(<<, >>)dnl

<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],

changequote([, ])dnl

[p=${PACKAGE-default}

case "$enableval" in

yes) enable_static=yes ;;

no) enable_static=no ;;

*)

  enable_static=no

  # Look at the argument we got.  We use all the common list separators.

  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"

  for pkg in $enableval; do

    if test "X$pkg" = "X$p"; then

      enable_static=yes

    fi

  done

  IFS="$ac_save_ifs"

  ;;

esac],

enable_static=AC_ENABLE_STATIC_DEFAULT)dnl

])



# AC_DISABLE_STATIC - set the default static flag to --disable-static

AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl

AC_ENABLE_STATIC(no)])





# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag

# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]

#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to

#   `yes'.

AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl

define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl

AC_ARG_ENABLE(fast-install,

changequote(<<, >>)dnl

<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],

changequote([, ])dnl

[p=${PACKAGE-default}

case "$enableval" in

yes) enable_fast_install=yes ;;

no) enable_fast_install=no ;;

*)

  enable_fast_install=no

  # Look at the argument we got.  We use all the common list separators.

  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"

  for pkg in $enableval; do

    if test "X$pkg" = "X$p"; then

      enable_fast_install=yes

    fi

  done

  IFS="$ac_save_ifs"

  ;;

esac],

enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl

])



# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install

AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl

AC_ENABLE_FAST_INSTALL(no)])



# AC_PROG_LD - find the path to the GNU or non-GNU linker

AC_DEFUN(AC_PROG_LD,

[AC_ARG_WITH(gnu-ld,

[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],

test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)

AC_REQUIRE([AC_PROG_CC])dnl

AC_REQUIRE([AC_CANONICAL_HOST])dnl

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

ac_prog=ld

if test "$ac_cv_prog_gcc" = yes; then

  # Check if gcc -print-prog-name=ld gives a path.

  AC_MSG_CHECKING([for ld used by GCC])

  ac_prog=`($CC -print-prog-name=ld) 2>&5`

  case "$ac_prog" in

    # Accept absolute paths.

changequote(,)dnl

    [\\/]* | [A-Za-z]:[\\/]*)

      re_direlt='/[^/][^/]*/\.\./'

changequote([,])dnl

      # Canonicalize the path of ld

      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`

      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do

	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`

      done

      test -z "$LD" && LD="$ac_prog"

      ;;

  "")

    # If it fails, then pretend we aren't using GCC.

    ac_prog=ld

    ;;

  *)

    # If it is relative, then search for the first ld in PATH.

    with_gnu_ld=unknown

    ;;

  esac

elif test "$with_gnu_ld" = yes; then

  AC_MSG_CHECKING([for GNU ld])

else

  AC_MSG_CHECKING([for non-GNU ld])

fi

AC_CACHE_VAL(ac_cv_path_LD,

[if test -z "$LD"; then

  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

  for ac_dir in $PATH; do

    test -z "$ac_dir" && ac_dir=.

    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then

      ac_cv_path_LD="$ac_dir/$ac_prog"

      # Check to see if the program is GNU ld.  I'd rather use --version,

      # but apparently some GNU ld's only accept -v.

      # Break only if it was the GNU/non-GNU ld that we prefer.

      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then

	test "$with_gnu_ld" != no && break

      else

	test "$with_gnu_ld" != yes && break

      fi

    fi

  done

  IFS="$ac_save_ifs"

else

  ac_cv_path_LD="$LD" # Let the user override the test with a path.

fi])

LD="$ac_cv_path_LD"

if test -n "$LD"; then

  AC_MSG_RESULT($LD)

else

  AC_MSG_RESULT(no)

fi

test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])

AC_PROG_LD_GNU

])



AC_DEFUN(AC_PROG_LD_GNU,

[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,

[# I'd rather use --version here, but apparently some GNU ld's only accept -v.

if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then

  ac_cv_prog_gnu_ld=yes

else

  ac_cv_prog_gnu_ld=no

fi])

])



# AC_PROG_NM - find the path to a BSD-compatible name lister

AC_DEFUN(AC_PROG_NM,

[AC_MSG_CHECKING([for BSD-compatible nm])

AC_CACHE_VAL(ac_cv_path_NM,

[if test -n "$NM"; then

  # Let the user override the test.

  ac_cv_path_NM="$NM"

else

  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do

    test -z "$ac_dir" && ac_dir=.

    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then

      # Check to see if the nm accepts a BSD-compat flag.

      # Adding the `sed 1q' prevents false positives on HP-UX, which says:

      #   nm: unknown option "B" ignored

      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then

	ac_cv_path_NM="$ac_dir/nm -B"

	break

      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then

	ac_cv_path_NM="$ac_dir/nm -p"

	break

      else

	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but

	continue # so that we can try to find one that supports BSD flags

      fi

    fi

  done

  IFS="$ac_save_ifs"

  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm

fi])

NM="$ac_cv_path_NM"

AC_MSG_RESULT([$NM])

])



# AC_CHECK_LIBM - check for math library

AC_DEFUN(AC_CHECK_LIBM,

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

LIBM=

case "$lt_target" in

*-*-beos* | *-*-cygwin*)

  # These system don't have libm

  ;;

*-ncr-sysv4.3*)

  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")

  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")

  ;;

*)

  AC_CHECK_LIB(m, main, LIBM="-lm")

  ;;

esac

])



# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for

# the libltdl convenience library, adds --enable-ltdl-convenience to

# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor

# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed

# to be `${top_builddir}/libltdl'.  Make sure you start DIR with

# '${top_builddir}/' (note the single quotes!) if your package is not

# flat, and, if you're not using automake, define top_builddir as

# appropriate in the Makefiles.

AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl

  case "$enable_ltdl_convenience" in

  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;

  "") enable_ltdl_convenience=yes

      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;

  esac

  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la

  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])

])



# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for

# the libltdl installable library, and adds --enable-ltdl-install to

# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor

# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed

# to be `${top_builddir}/libltdl'.  Make sure you start DIR with

# '${top_builddir}/' (note the single quotes!) if your package is not

# flat, and, if you're not using automake, define top_builddir as

# appropriate in the Makefiles.

# In the future, this macro may have to be called after AC_PROG_LIBTOOL.

AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl

  AC_CHECK_LIB(ltdl, main,

  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],

  [if test x"$enable_ltdl_install" = xno; then

     AC_MSG_WARN([libltdl not installed, but installation disabled])

   else

     enable_ltdl_install=yes

   fi

  ])

  if test x"$enable_ltdl_install" = x"yes"; then

    ac_configure_args="$ac_configure_args --enable-ltdl-install"

    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la

    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])

  else

    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"

    LIBLTDL="-lltdl"

    INCLTDL=

  fi

])



dnl old names

AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl

AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl

AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl

AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl

AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl

AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl

AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl



dnl This is just to silence aclocal about the macro not being used

ifelse([AC_DISABLE_FAST_INSTALL])dnl

config.guess

+502 −278

File changed.

Preview size limit exceeded, changes collapsed.

config.sub

+177 −108

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+4 −2
Original line number Diff line number Diff line
@@ -446,6 +446,9 @@ AC_MSG_RESULT("$CHECK_PID") 
# We need a ANSI C compiler

AM_PROG_CC_STDC



# We need an assembler, too

AM_PROG_AS



if test "$am_cv_prog_cc_stdc" = "no"

then

  AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
@@ -668,8 +671,7 @@ else 
  AC_MSG_RESULT([no])

fi



# Use Paul Eggerts macros from GNU tar to check for large file support.

MYSQL_SYS_LARGEFILE

AC_SYS_LARGEFILE



# Types that must be checked AFTER large file support is checked

AC_TYPE_SIZE_T

dbug/Makefile.am

+0 −9
Original line number Diff line number Diff line
@@ -24,15 +24,6 @@ EXTRA_DIST = example1.c example2.c example3.c \ 
			user.r monty.doc readme.prof \

			main.c factorial.c dbug_analyze.c



OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\

			__math.h time.h __time.h unistd.h __unistd.h types.h \

			xtypes.h ac-types.h posix.h string.h __string.h \

			errno.h socket.h inet.h dirent.h netdb.h \

			cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \

			prio_queue.h pthread_attr.h pthread_once.h queue.h\

			sleep.h specific.h version.h pwd.h timers.h uio.h \

			cdefs.h machdep.h signal.h __signal.h util.h



# Must be linked with libs that are not compiled yet

extra_progs: factorial dbug_analyze