mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
New file. Contains `libtool.m4' from libtool-1.2, the version from which
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2, the version from which glib's libtool forked. Needed for people who use post-1.2 alphas of libtool. * configure.in (enable_mem_check, enable_mem_profile): Replace `echo -n' with AC_MSG_CHECKING. (fd_set): Explain test for `fd_set' better.
This commit is contained in:
Raja R Harinath
parent
1169373367
commit
580b16fb22
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1998-06-10 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* acinclude.m4: New file. Contains `libtool.m4' from libtool-1.2,
|
||||
the version from which glib's libtool forked. Needed for people
|
||||
who use post-1.2 alphas of libtool.
|
||||
* configure.in (enable_mem_check, enable_mem_profile): Replace
|
||||
`echo -n' with AC_MSG_CHECKING.
|
||||
(fd_set): Explain test for `fd_set' better.
|
||||
|
||||
Wed Jun 10 19:29:51 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* Makefile.am glib.m4 configure.in:
|
||||
|
||||
259
acinclude.m4
Normal file
259
acinclude.m4
Normal file
@ -0,0 +1,259 @@
|
||||
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
|
||||
## Copyright (C) 1996-1998 Free Software Foundation, Inc.
|
||||
## 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 24 AM_PROG_LIBTOOL
|
||||
AC_DEFUN(AM_PROG_LIBTOOL,
|
||||
[AC_REQUIRE([AM_ENABLE_SHARED])dnl
|
||||
AC_REQUIRE([AM_ENABLE_STATIC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AM_PROG_LD])dnl
|
||||
AC_REQUIRE([AM_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
dnl
|
||||
# Always use our own libtool.
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
AC_SUBST(LIBTOOL)dnl
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
libtool_flags=
|
||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
||||
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
|
||||
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"
|
||||
|
||||
# Some flags need to be propagated to the compiler or linker for good
|
||||
# libtool support.
|
||||
case "$host" 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.
|
||||
CFLAGS="$CFLAGS -belf"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
||||
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
||||
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| AC_MSG_ERROR([libtool configure failed])
|
||||
])
|
||||
|
||||
# AM_ENABLE_SHARED - implement the --enable-shared flag
|
||||
# Usage: AM_ENABLE_SHARED[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AM_ENABLE_SHARED,
|
||||
[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(shared,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
|
||||
changequote([, ])dnl
|
||||
[ --enable-shared=PKGS only build shared libraries if the current package
|
||||
appears as an element in the PKGS list],
|
||||
[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=AM_ENABLE_SHARED_DEFAULT)dnl
|
||||
])
|
||||
|
||||
# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
|
||||
AC_DEFUN(AM_DISABLE_SHARED,
|
||||
[AM_ENABLE_SHARED(no)])
|
||||
|
||||
# AM_DISABLE_STATIC - set the default static flag to --disable-static
|
||||
AC_DEFUN(AM_DISABLE_STATIC,
|
||||
[AM_ENABLE_STATIC(no)])
|
||||
|
||||
# AM_ENABLE_STATIC - implement the --enable-static flag
|
||||
# Usage: AM_ENABLE_STATIC[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AM_ENABLE_STATIC,
|
||||
[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(static,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
|
||||
changequote([, ])dnl
|
||||
[ --enable-static=PKGS only build shared libraries if the current package
|
||||
appears as an element in the PKGS list],
|
||||
[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=AM_ENABLE_STATIC_DEFAULT)dnl
|
||||
])
|
||||
|
||||
|
||||
# AM_PROG_LD - find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN(AM_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])
|
||||
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.
|
||||
/* | [A-Za-z]:\\*)
|
||||
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}:"
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f "$ac_dir/$ac_prog"; 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_SUBST(LD)
|
||||
AM_PROG_LD_GNU
|
||||
])
|
||||
|
||||
AC_DEFUN(AM_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])
|
||||
])
|
||||
|
||||
# AM_PROG_NM - find the path to a BSD-compatible name lister
|
||||
AC_DEFUN(AM_PROG_NM,
|
||||
[AC_MSG_CHECKING([for BSD-compatible nm])
|
||||
AC_CACHE_VAL(ac_cv_path_NM,
|
||||
[case "$NM" in
|
||||
/* | [A-Za-z]:\\*)
|
||||
ac_cv_path_NM="$NM" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/nm; 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"
|
||||
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"
|
||||
else
|
||||
ac_cv_path_NM="$ac_dir/nm"
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
|
||||
;;
|
||||
esac])
|
||||
NM="$ac_cv_path_NM"
|
||||
AC_MSG_RESULT([$NM])
|
||||
AC_SUBST(NM)
|
||||
])
|
||||
33
configure.in
33
configure.in
@ -57,22 +57,22 @@ AC_ARG_ENABLE(mem_profile, [ --enable-mem-profile=[no/yes] turn on malloc profi
|
||||
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
|
||||
, enable_ansi=no)
|
||||
|
||||
echo -n "Enabling memory checking... "
|
||||
AC_MSG_CHECKING(whether to enable memory checking)
|
||||
if test "x$enable_mem_check" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_MEM_CHECK, 1)
|
||||
AC_SUBST(ENABLE_MEM_CHECK)
|
||||
echo "yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
echo "no"
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
echo -n "Enabling memory profiling... "
|
||||
AC_MSG_CHECKING(whether to enable memory profiling)
|
||||
if test "x$enable_mem_profile" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_MEM_PROFILE, 1)
|
||||
AC_SUBST(ENABLE_MEM_PROFILE)
|
||||
echo "yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
echo "no"
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
if test "x$enable_debug" = "xyes"; then
|
||||
@ -134,7 +134,7 @@ AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
|
||||
AC_CHECK_FUNCS(strerror strsignal memmove vsnprintf strcasecmp)
|
||||
|
||||
# Check for sys_errlist
|
||||
AC_MSG_CHECKING(sys_errlist)
|
||||
AC_MSG_CHECKING(for sys_errlist)
|
||||
AC_TRY_LINK(, [
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
@ -146,7 +146,7 @@ if test $glib_ok = no; then
|
||||
fi
|
||||
|
||||
# Check for sys_siglist
|
||||
AC_MSG_CHECKING(sys_siglist)
|
||||
AC_MSG_CHECKING(for sys_siglist)
|
||||
AC_TRY_LINK(, [
|
||||
extern char *sys_siglist[];
|
||||
sys_siglist[1][0] = 0;
|
||||
@ -156,21 +156,22 @@ if test $glib_ok = no; then
|
||||
AC_DEFINE(NO_SYS_SIGLIST)
|
||||
fi
|
||||
|
||||
# Check for sys/select.h
|
||||
|
||||
AC_MSG_CHECKING([fd_set and sys/select])
|
||||
# Check if <sys/select.h> needs to be included for fd_set
|
||||
AC_MSG_CHECKING([for fd_set])
|
||||
AC_TRY_COMPILE([#include <sys/types.h>],
|
||||
[fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
|
||||
if test $gtk_ok = no; then
|
||||
if test $gtk_ok = yes; then
|
||||
AC_MSG_RESULT([yes, found in sys/types.h])
|
||||
else
|
||||
AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
|
||||
if test $gtk_ok = yes; then
|
||||
AC_DEFINE(HAVE_SYS_SELECT_H)
|
||||
AC_MSG_RESULT([yes, found in sys/select.h])
|
||||
else
|
||||
AC_DEFINE(NO_FD_SET)
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($gtk_ok)
|
||||
if test $gtk_ok = no; then
|
||||
AC_DEFINE(NO_FD_SET)
|
||||
fi
|
||||
|
||||
# This stuff is here, only so that we can define these
|
||||
# things in glibconfig.h. If ../config.h was installed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user