Search
lxdream.org :: lxdream/aclocal.m4 :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename aclocal.m4
changeset 571:9bc09948d0f2
prev360:dff4a3bbac0c
next658:f5926310bfbe
author nkeynes
date Wed Jan 16 09:35:30 2008 +0000 (12 years ago)
permissions -rw-r--r--
last change Fix instruction side-effects in presence of exceptions
file annotate diff log raw
1.1 --- a/aclocal.m4 Thu Aug 23 12:34:43 2007 +0000
1.2 +++ b/aclocal.m4 Wed Jan 16 09:35:30 2008 +0000
1.3 @@ -1006,6 +1006,38 @@
1.4
1.5 AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
1.6
1.7 +# Figure out how to run the assembler. -*- Autoconf -*-
1.8 +
1.9 +# serial 2
1.10 +
1.11 +# Copyright 2001 Free Software Foundation, Inc.
1.12 +
1.13 +# This program is free software; you can redistribute it and/or modify
1.14 +# it under the terms of the GNU General Public License as published by
1.15 +# the Free Software Foundation; either version 2, or (at your option)
1.16 +# any later version.
1.17 +
1.18 +# This program is distributed in the hope that it will be useful,
1.19 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1.20 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.21 +# GNU General Public License for more details.
1.22 +
1.23 +# You should have received a copy of the GNU General Public License
1.24 +# along with this program; if not, write to the Free Software
1.25 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1.26 +# 02111-1307, USA.
1.27 +
1.28 +# AM_PROG_AS
1.29 +# ----------
1.30 +AC_DEFUN([AM_PROG_AS],
1.31 +[# By default we simply use the C compiler to build assembly code.
1.32 +AC_REQUIRE([AC_PROG_CC])
1.33 +: ${CCAS='$(CC)'}
1.34 +# Set ASFLAGS if not already set.
1.35 +: ${CCASFLAGS='$(CFLAGS)'}
1.36 +AC_SUBST(CCAS)
1.37 +AC_SUBST(CCASFLAGS)])
1.38 +
1.39 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1.40 #
1.41 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1.42 @@ -1144,7 +1176,8 @@
1.43
1.44 _PKG_TEXT
1.45 ])],
1.46 - [$4])
1.47 + [AC_MSG_RESULT([no])
1.48 + $4])
1.49 elif test $pkg_failed = untried; then
1.50 ifelse([$4], , [AC_MSG_FAILURE(dnl
1.51 [The pkg-config script could not be found or is too old. Make sure it
1.52 @@ -1266,7 +1299,8 @@
1.53 #-----------------
1.54 glib_DEFUN([GLIB_WITH_NLS],
1.55 dnl NLS is obligatory
1.56 - [USE_NLS=yes
1.57 + [AC_REQUIRE([AC_CANONICAL_HOST])dnl
1.58 + USE_NLS=yes
1.59 AC_SUBST(USE_NLS)
1.60
1.61 gt_cv_have_gettext=no
1.62 @@ -1370,6 +1404,20 @@
1.63 glib_save_LIBS="$LIBS"
1.64 LIBS="$LIBS $INTLLIBS"
1.65 AC_CHECK_FUNCS(dcgettext)
1.66 + MSGFMT_OPTS=
1.67 + AC_MSG_CHECKING([if msgfmt accepts -c])
1.68 + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1.69 +msgid ""
1.70 +msgstr ""
1.71 +"Content-Type: text/plain; charset=UTF-8\n"
1.72 +"Project-Id-Version: test 1.0\n"
1.73 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1.74 +"Last-Translator: test <foo@bar.xx>\n"
1.75 +"Language-Team: C <LL@li.org>\n"
1.76 +"MIME-Version: 1.0\n"
1.77 +"Content-Transfer-Encoding: 8bit\n"
1.78 +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1.79 + AC_SUBST(MSGFMT_OPTS)
1.80 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1.81 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1.82 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1.83 @@ -1541,8 +1589,10 @@
1.84 [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1.85 glib_save_prefix="$prefix"
1.86 glib_save_exec_prefix="$exec_prefix"
1.87 +glib_save_datarootdir="$datarootdir"
1.88 test "x$prefix" = xNONE && prefix=$ac_default_prefix
1.89 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1.90 +datarootdir=`eval echo "${datarootdir}"`
1.91 if test "x$CATOBJEXT" = "x.mo" ; then
1.92 localedir=`eval echo "${libdir}/locale"`
1.93 else
1.94 @@ -1550,6 +1600,7 @@
1.95 fi
1.96 prefix="$glib_save_prefix"
1.97 exec_prefix="$glib_save_exec_prefix"
1.98 +datarootdir="$glib_save_datarootdir"
1.99 AC_DEFINE_UNQUOTED($1, "$localedir",
1.100 [Define the location where the catalogs will be installed])
1.101 ])
1.102 @@ -1562,3 +1613,20 @@
1.103 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1.104 ])dnl
1.105
1.106 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1.107 +#
1.108 +# Create a temporary file with TEST-FILE as its contents and pass the
1.109 +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1.110 +# 0 and perform ACTION-IF-FAIL for any other exit status.
1.111 +AC_DEFUN([GLIB_RUN_PROG],
1.112 +[cat >conftest.foo <<_ACEOF
1.113 +$2
1.114 +_ACEOF
1.115 +if AC_RUN_LOG([$1 conftest.foo]); then
1.116 + m4_ifval([$3], [$3], [:])
1.117 +m4_ifvaln([$4], [else $4])dnl
1.118 +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1.119 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1.120 +fi])
1.121 +
1.122 +
.