comparison configure.ac @ 9946:55061c7c8d6e

start using gnulib
author John W. Eaton <jwe@octave.org>
date Wed, 09 Dec 2009 01:36:50 -0500
parents f0f7c2477cdb
children cc7ea6083774
comparison
equal deleted inserted replaced
9945:b4661b498a7e 9946:55061c7c8d6e
27 ### AC_PROG_CC or AC_PROG_CXX. 27 ### AC_PROG_CC or AC_PROG_CXX.
28 28
29 EXTERN_CFLAGS="$CFLAGS" 29 EXTERN_CFLAGS="$CFLAGS"
30 EXTERN_CXXFLAGS="$CXXFLAGS" 30 EXTERN_CXXFLAGS="$CXXFLAGS"
31 31
32 AC_INIT([GNU Octave], [3.3.50+], [bug@octave.org], [octave], [http://www.octave.org]) 32 AC_INIT([GNU Octave], [3.3.50+], [bug@octave.org], [octave])
33 33
34 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg 34 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
35 OCTAVE_VERSION="$PACKAGE_VERSION" 35 OCTAVE_VERSION="$PACKAGE_VERSION"
36 OCTAVE_API_VERSION_NUMBER="38" 36 OCTAVE_API_VERSION_NUMBER="38"
37 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" 37 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+"
41 AC_SUBST(OCTAVE_API_VERSION_NUMBER) 41 AC_SUBST(OCTAVE_API_VERSION_NUMBER)
42 AC_SUBST(OCTAVE_API_VERSION) 42 AC_SUBST(OCTAVE_API_VERSION)
43 AC_SUBST(OCTAVE_RELEASE_DATE) 43 AC_SUBST(OCTAVE_RELEASE_DATE)
44 AC_SUBST(OCTAVE_COPYRIGHT) 44 AC_SUBST(OCTAVE_COPYRIGHT)
45 45
46 AM_INIT_AUTOMAKE([1.11 tar-ustar])
47 AC_REVISION($Revision: 1.603 $) 46 AC_REVISION($Revision: 1.603 $)
48 AC_PREREQ([2.62]) 47 AC_PREREQ([2.62])
49 AC_CONFIG_SRCDIR([src/octave.cc]) 48 AC_CONFIG_SRCDIR([src/octave.cc])
50 AC_CONFIG_HEADER([config.h]) 49 AC_CONFIG_HEADER([config.h])
50 AC_CONFIG_AUX_DIR([build-aux])
51 AC_CONFIG_MACRO_DIR([m4]) 51 AC_CONFIG_MACRO_DIR([m4])
52
53 AM_INIT_AUTOMAKE([1.11 tar-ustar])
52 54
53 OCTAVE_HOST_TYPE 55 OCTAVE_HOST_TYPE
54 56
55 AC_DEFINE(OCTAVE_SOURCE, 1, [Define if this is Octave.]) 57 AC_DEFINE(OCTAVE_SOURCE, 1, [Define if this is Octave.])
56 58
224 ### See which C compiler to use (we expect to find gcc). 226 ### See which C compiler to use (we expect to find gcc).
225 227
226 AC_PROG_CC 228 AC_PROG_CC
227 AC_PROG_CPP 229 AC_PROG_CPP
228 AC_PROG_GCC_TRADITIONAL 230 AC_PROG_GCC_TRADITIONAL
231
232 ### gnulib
233
234 gl_EARLY
235 gl_INIT
229 236
230 ### Do special things for gcc. 237 ### Do special things for gcc.
231 238
232 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ 239 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \
233 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'` 240 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'`
1492 LIBS="$save_LIBS" 1499 LIBS="$save_LIBS"
1493 ]) 1500 ])
1494 ;; 1501 ;;
1495 esac 1502 esac
1496 1503
1497 case "$canonical_host_type" in
1498 *-*-msdosmsvc | *-*-mingw*)
1499 ## The %T and %e format specifiers for strftime are not implemented
1500 ## so use our version. We could use an actual configure test
1501 ## for this.
1502 ;;
1503 *)
1504 AC_CHECK_FUNCS(strftime)
1505 ;;
1506 esac
1507
1508 OCTAVE_HAVE_C99_VSNPRINTF 1504 OCTAVE_HAVE_C99_VSNPRINTF
1509 OCTAVE_STRPTIME_BROKEN 1505 OCTAVE_STRPTIME_BROKEN
1510 OCTAVE_SMART_PUTENV 1506 OCTAVE_SMART_PUTENV
1511 1507
1512 case "$canonical_host_type" in 1508 case "$canonical_host_type" in
2141 doc/liboctave/Makefile 2137 doc/liboctave/Makefile
2142 doc/refcard/Makefile 2138 doc/refcard/Makefile
2143 examples/Makefile 2139 examples/Makefile
2144 libcruft/Makefile 2140 libcruft/Makefile
2145 libcruft/mkf77def 2141 libcruft/mkf77def
2142 libgnu/Makefile
2146 liboctave/Makefile 2143 liboctave/Makefile
2147 scripts/Makefile 2144 scripts/Makefile
2148 src/Makefile 2145 src/Makefile
2149 test/Makefile]) 2146 test/Makefile])
2150 2147