From 3cc0a8ce89d9399258a9a200ee43d3e57f752dca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 May 2009 00:28:06 +0000 Subject: patch from bowman + autoreconf git-svn-id: svn://tug.org/texlive/trunk@13286 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/asymptote/configure | 45 +++++++++++++++++------- Build/source/utils/asymptote/configure.ac | 30 +++++++++++----- Build/source/utils/asymptote/doc/Makefile.in | 1 + Build/source/utils/asymptote/doc/png/Makefile | 4 +-- Build/source/utils/asymptote/doc/png/Makefile.in | 2 +- 5 files changed, 58 insertions(+), 24 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index a650b3dbc0d..e96dd617ddb 100755 --- a/Build/source/utils/asymptote/configure +++ b/Build/source/utils/asymptote/configure @@ -720,6 +720,8 @@ enable_tetex_build enable_gc enable_gc_debug enable_gc_full_debug +enable_gsl +enable_gl ' ac_precious_vars='build_alias host_alias @@ -1357,12 +1359,14 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-tetex-build automatically determine settings.sysdir from kpsewhich + --enable-tetex-build automatically determine sysdir from kpsewhich --enable-gc[=system] enable system Boehm garbage collector [=VERSION] enable local VERSION of Boehm garbage collector [=PREFIX] use Boehm garbage collector installed in PREFIX --enable-gc-debug enable (slow) garbage collector debugging --enable-gc-full-debug enable (very slow) garbage collector backtrace + --enable-gsl[=yes] enable GNU Scientific Library + --enable-gl[=yes] enable OpenGL Library Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -8212,7 +8216,14 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test "${ac_cv_header_gsl_gsl_sf_h+set}" = set; then +# Check whether --enable-gsl was given. +if test "${enable_gsl+set}" = set; then + enableval=$enable_gsl; +fi + + +if test "x$enable_gsl" != "xno"; then + if test "${ac_cv_header_gsl_gsl_sf_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for gsl/gsl_sf.h" >&5 $as_echo_n "checking for gsl/gsl_sf.h... " >&6; } if test "${ac_cv_header_gsl_gsl_sf_h+set}" = set; then @@ -8345,9 +8356,9 @@ $as_echo "$ac_cv_header_gsl_gsl_sf_h" >&6; } fi if test "x$ac_cv_header_gsl_gsl_sf_h" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for gsl_sf_Si in -lgsl" >&5 -$as_echo_n "checking for gsl_sf_Si in -lgsl... " >&6; } -if test "${ac_cv_lib_gsl_gsl_sf_Si+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for gsl_sf_debye_6 in -lgsl" >&5 +$as_echo_n "checking for gsl_sf_debye_6 in -lgsl... " >&6; } +if test "${ac_cv_lib_gsl_gsl_sf_debye_6+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8365,11 +8376,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char gsl_sf_Si (); +char gsl_sf_debye_6 (); int main () { -return gsl_sf_Si (); +return gsl_sf_debye_6 (); ; return 0; } @@ -8395,12 +8406,12 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_gsl_gsl_sf_Si=yes + ac_cv_lib_gsl_gsl_sf_debye_6=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gsl_gsl_sf_Si=no + ac_cv_lib_gsl_gsl_sf_debye_6=no fi rm -rf conftest.dSYM @@ -8408,9 +8419,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gsl_gsl_sf_Si" >&5 -$as_echo "$ac_cv_lib_gsl_gsl_sf_Si" >&6; } -if test "x$ac_cv_lib_gsl_gsl_sf_Si" = x""yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gsl_gsl_sf_debye_6" >&5 +$as_echo "$ac_cv_lib_gsl_gsl_sf_debye_6" >&6; } +if test "x$ac_cv_lib_gsl_gsl_sf_debye_6" = x""yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBGSL 1 @@ -8427,7 +8438,15 @@ $as_echo "$as_me: *** Header file gsl_sf.h not found: will compile without optio fi +fi + +# Check whether --enable-gl was given. +if test "${enable_gl+set}" = set; then + enableval=$enable_gl; +fi + +if test "x$enable_gl" != "xno"; then case "$OSTYPE" in cygwin) if test "${ac_cv_header_GL_glut_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for GL/glut.h" >&5 @@ -9014,7 +9033,7 @@ $as_echo "$as_me: *** Could not find libGLU: will compile without OpenGL support fi esac - +fi # Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:$LINENO: checking for pid_t" >&5 diff --git a/Build/source/utils/asymptote/configure.ac b/Build/source/utils/asymptote/configure.ac index 0e84c226bb4..8d69537dddc 100644 --- a/Build/source/utils/asymptote/configure.ac +++ b/Build/source/utils/asymptote/configure.ac @@ -48,7 +48,8 @@ AC_SUBST(latexdir) docdir=$Datadir/doc/asymptote AC_ARG_WITH(docdir, - [ --with-docdir=PATH alternate documentation installation directory], + [AS_HELP_STRING(--with-docdir=PATH, +alternate documentation installation directory)], [if test "x$withval" != "x" ; then docdir=$withval fi @@ -58,7 +59,8 @@ AC_SUBST(docdir) sysdir=$Datadir/asymptote AC_ARG_ENABLE(tetex-build, -[ --enable-tetex-build automatically determine settings.sysdir from kpsewhich], +[AS_HELP_STRING(--enable-tetex-build, +automatically determine sysdir from kpsewhich)], [ if test "x$enableval" = "xyes" ; then sysdir="" fi @@ -100,7 +102,8 @@ ac_cv_use_gc=$GCVERSION, [GC_SYSTEM="$GCVERSION.tar.gz not found: using system Boehm garbage collector" ac_cv_use_gc="system"]) AC_ARG_ENABLE(gc, - [ --enable-gc[[=system]] enable system Boehm garbage collector] + [AS_HELP_STRING(--enable-gc[[[=system]]], +enable system Boehm garbage collector)] [ [[=VERSION]] enable local VERSION of Boehm garbage collector] [ [[=PREFIX]] use Boehm garbage collector installed in PREFIX], [ @@ -153,7 +156,7 @@ else fi AC_ARG_ENABLE(gc-debug, -[ --enable-gc-debug enable (slow) garbage collector debugging], +[AS_HELP_STRING(--enable-gc-debug,enable (slow) garbage collector debugging)], [ if test "x$ac_cv_use_gc" != "xno" ; then if test "x$enableval" = "xyes" ; then OPTIONS=$OPTIONS"-DGC_DEBUG " @@ -164,7 +167,7 @@ AC_ARG_ENABLE(gc-debug, ]) AC_ARG_ENABLE(gc-full-debug, -[ --enable-gc-full-debug enable (very slow) garbage collector backtrace], +[AS_HELP_STRING(--enable-gc-full-debug,enable (very slow) garbage collector backtrace)], [ if test "x$ac_cv_use_gc" != "xno" ; then if test "x$enableval" = "xyes" ; then OPTIONS=$OPTIONS"-DGC_DEBUG -DGC_BACKTRACE " @@ -212,12 +215,23 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include "xstream.h"]), [Define if you have a working header file])], AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) -AC_CHECK_HEADER(gsl/gsl_sf.h, - AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, +AC_ARG_ENABLE(gsl, +[AS_HELP_STRING(--enable-gsl[[[=yes]]],enable GNU Scientific Library)], +) + +if test "x$enable_gsl" != "xno"; then + AC_CHECK_HEADER(gsl/gsl_sf.h, + AC_CHECK_LIB([gsl], gsl_sf_debye_6, [AC_DEFINE(HAVE_LIBGSL, 1, [Define to 1 if you have the 'gsl' library (-lgsl). ]) LIBS=$LIBS"-lgsl -lgslcblas "], AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) +fi + +AC_ARG_ENABLE(gl, +[AS_HELP_STRING(--enable-gl[[[=yes]]],enable OpenGL Library)], +) +if test "x$enable_gl" != "xno"; then case "$OSTYPE" in cygwin) AC_CHECK_HEADER(GL/glut.h, [AC_DEFINE(HAVE_LIBGLUT, 1, @@ -251,7 +265,7 @@ void f(void) { AC_CHECK_LIB([GLU], [gluNewNurbsRenderer],, AC_MSG_NOTICE([*** Could not find libGLU: will compile without OpenGL support ***])) esac - +fi # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_PID_T diff --git a/Build/source/utils/asymptote/doc/Makefile.in b/Build/source/utils/asymptote/doc/Makefile.in index f4141a02780..93aba13dfe8 100644 --- a/Build/source/utils/asymptote/doc/Makefile.in +++ b/Build/source/utils/asymptote/doc/Makefile.in @@ -93,4 +93,5 @@ uninstall-all: distclean: FORCE clean -rm -f version.texi Makefile cd FAQ; make distclean + cd png; make distclean FORCE: diff --git a/Build/source/utils/asymptote/doc/png/Makefile b/Build/source/utils/asymptote/doc/png/Makefile index dba4da51890..a62730f5ebc 100644 --- a/Build/source/utils/asymptote/doc/png/Makefile +++ b/Build/source/utils/asymptote/doc/png/Makefile @@ -5,7 +5,7 @@ ASY = ../asy -dir ../base -config "" -render=0 docdir = $(DESTDIR)/usr/local/share/doc/asymptote infodir = $(DESTDIR)${datarootdir}/info datarootdir = ${prefix}/share -INSTALL = /usr/bin/ginstall -c +INSTALL = /usr/local/gnu/bin/install -c all: html info @@ -29,7 +29,7 @@ info: asymptote.info clean: FORCE -rm -f *.png *.html asymptote.info* texput.aux texput.log -distclean: +distclean: FORCE clean -rm -f Makefile install: diff --git a/Build/source/utils/asymptote/doc/png/Makefile.in b/Build/source/utils/asymptote/doc/png/Makefile.in index d49c9813578..798fb9ef969 100644 --- a/Build/source/utils/asymptote/doc/png/Makefile.in +++ b/Build/source/utils/asymptote/doc/png/Makefile.in @@ -29,7 +29,7 @@ info: asymptote.info clean: FORCE -rm -f *.png *.html asymptote.info* texput.aux texput.log -distclean: +distclean: FORCE clean -rm -f Makefile install: -- cgit v1.2.3