diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-10 14:21:51 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-10 14:21:51 +0000 |
commit | fb208458531f4362d2b794f246c70ccb126c403c (patch) | |
tree | 00bfdedbb11a52d87059f12c511dc62dbea58757 | |
parent | 1bb2e91774ffe4ac4202fd9263e77eb800d27d24 (diff) |
fix build problem with misuse of config cache file
git-svn-id: svn://tug.org/texlive/trunk@13029 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/libs/obsdcompat/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/obsdcompat/Makefile.am | 3 | ||||
-rw-r--r-- | Build/source/libs/obsdcompat/Makefile.in | 3 | ||||
-rwxr-xr-x | Build/source/libs/obsdcompat/configure | 44 | ||||
-rw-r--r-- | Build/source/libs/obsdcompat/configure.ac | 9 |
5 files changed, 47 insertions, 17 deletions
diff --git a/Build/source/libs/obsdcompat/ChangeLog b/Build/source/libs/obsdcompat/ChangeLog index 9cc14b044f6..d7a2bd06abd 100644 --- a/Build/source/libs/obsdcompat/ChangeLog +++ b/Build/source/libs/obsdcompat/ChangeLog @@ -1,3 +1,8 @@ +2009-05-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Don't check LLONG_MAX twice, otherwise may use + wrong value from cache file. + 2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> Adapt to TL2009 build system. diff --git a/Build/source/libs/obsdcompat/Makefile.am b/Build/source/libs/obsdcompat/Makefile.am index 3c61bb47084..019c5b066a8 100644 --- a/Build/source/libs/obsdcompat/Makefile.am +++ b/Build/source/libs/obsdcompat/Makefile.am @@ -5,7 +5,10 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 +if build noinst_LIBRARIES = libopenbsd-compat.a +endif build +EXTRA_LIBRARIES = libopenbsd-compat.a compat_sources = \ bsd-asprintf.c \ diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in index 997e47f12ce..4589eb9f135 100644 --- a/Build/source/libs/obsdcompat/Makefile.in +++ b/Build/source/libs/obsdcompat/Makefile.in @@ -188,7 +188,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -noinst_LIBRARIES = libopenbsd-compat.a +@build_TRUE@noinst_LIBRARIES = libopenbsd-compat.a +EXTRA_LIBRARIES = libopenbsd-compat.a compat_sources = \ bsd-asprintf.c \ bsd-snprintf.c diff --git a/Build/source/libs/obsdcompat/configure b/Build/source/libs/obsdcompat/configure index af85d301f96..d6092cb1af0 100755 --- a/Build/source/libs/obsdcompat/configure +++ b/Build/source/libs/obsdcompat/configure @@ -675,6 +675,8 @@ CPPFLAGS LDFLAGS CFLAGS CC +build_FALSE +build_TRUE MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -2381,6 +2383,15 @@ fi + if test "x$enable_build" != xno; then + build_TRUE= + build_FALSE='#' +else + build_TRUE='#' + build_FALSE= +fi + + ac_config_headers="$ac_config_headers obsdcompat/config.h" ac_ext=c @@ -5598,13 +5609,12 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then esac if test -z "$have_llong_max"; then - # retry LLONG_MAX with -std=gnu99, needed on some Linuxes - unset ac_cv_have_decl_LLONG_MAX + # now try LLONG_MIN with -std=gnu99, needed on some Linuxes saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -std=gnu99" - { $as_echo "$as_me:$LINENO: checking whether LLONG_MAX is declared" >&5 -$as_echo_n "checking whether LLONG_MAX is declared... " >&6; } -if test "${ac_cv_have_decl_LLONG_MAX+set}" = set; then + { $as_echo "$as_me:$LINENO: checking whether LLONG_MIN is declared" >&5 +$as_echo_n "checking whether LLONG_MIN is declared... " >&6; } +if test "${ac_cv_have_decl_LLONG_MIN+set}" = set; then $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -5619,8 +5629,8 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef LLONG_MAX - (void) LLONG_MAX; +#ifndef LLONG_MIN + (void) LLONG_MIN; #endif ; @@ -5645,19 +5655,19 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl_LLONG_MAX=yes + ac_cv_have_decl_LLONG_MIN=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_LLONG_MAX=no + ac_cv_have_decl_LLONG_MIN=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_LLONG_MAX" >&5 -$as_echo "$ac_cv_have_decl_LLONG_MAX" >&6; } -if test "x$ac_cv_have_decl_LLONG_MAX" = x""yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_LLONG_MIN" >&5 +$as_echo "$ac_cv_have_decl_LLONG_MIN" >&6; } +if test "x$ac_cv_have_decl_LLONG_MIN" = x""yes; then have_llong_max=1 else CFLAGS="$saved_CFLAGS" @@ -10773,6 +10783,13 @@ $as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"build\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"build\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -11953,6 +11970,9 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in + "obsdcompat/config.h":H) sed -e 's/^#define PACKAGE/#define OBSD_PACKAGE/' \ + -e 's/^#define VERSION/#define OBSD_VERSION/' \ + obsdcompat/config.h >obsdcompat/config.tmp && mv -f obsdcompat/config.tmp obsdcompat/config.h ;; "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. diff --git a/Build/source/libs/obsdcompat/configure.ac b/Build/source/libs/obsdcompat/configure.ac index 64748cf0393..734d7304cc3 100644 --- a/Build/source/libs/obsdcompat/configure.ac +++ b/Build/source/libs/obsdcompat/configure.ac @@ -28,7 +28,9 @@ AC_CONFIG_MACRO_DIR([../../m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_CONFIG_HEADER([obsdcompat/config.h], +AM_CONDITIONAL([build], [test "x$enable_build" != xno]) + +AC_CONFIG_HEADERS([obsdcompat/config.h], [sed -e 's/^#define PACKAGE/#define OBSD_PACKAGE/' \ -e 's/^#define VERSION/#define OBSD_VERSION/' \ obsdcompat/config.h >obsdcompat/config.tmp && mv -f obsdcompat/config.tmp obsdcompat/config.h]) @@ -78,11 +80,10 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then esac if test -z "$have_llong_max"; then - # retry LLONG_MAX with -std=gnu99, needed on some Linuxes - unset ac_cv_have_decl_LLONG_MAX + # now try LLONG_MIN with -std=gnu99, needed on some Linuxes saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -std=gnu99" - AC_CHECK_DECL(LLONG_MAX, + AC_CHECK_DECL(LLONG_MIN, [have_llong_max=1], [CFLAGS="$saved_CFLAGS"], [#include <limits.h>] |