Deleted Added
full compact
configure.ac (298067) configure.ac (298083)
1#
2# $Id$
3#
4# See ./INSTALL for more info
5#
6
7#
8# Release numbering: even numbered dot releases are official ones, and
9# odd numbers are development ones. The svn version of this file will
10# only (ONLY!) ever (EVER!) contain odd numbers, so I'll always know if
11# a particular user has the dist or svn release.
12#
13
14AC_PREREQ(2.2)
1#
2# $Id$
3#
4# See ./INSTALL for more info
5#
6
7#
8# Release numbering: even numbered dot releases are official ones, and
9# odd numbers are development ones. The svn version of this file will
10# only (ONLY!) ever (EVER!) contain odd numbers, so I'll always know if
11# a particular user has the dist or svn release.
12#
13
14AC_PREREQ(2.2)
15AC_INIT([libxo], [0.4.7], [phil@juniper.net])
15AC_INIT([libxo], [0.6.1], [phil@juniper.net])
16AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
17
18# Support silent build rules. Requires at least automake-1.11.
19# Disable with "configure --disable-silent-rules" or "make V=1"
20m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
21
22AC_PROG_CC
23AM_PROG_AR

--- 45 unchanged lines hidden (view full) ---

69AC_CHECK_HEADERS([stdtime/tzfile.h])
70AC_CHECK_FUNCS([dlfunc])
71
72AC_CHECK_HEADERS([sys/time.h])
73AC_CHECK_HEADERS([ctype.h errno.h stdio.h stdlib.h])
74AC_CHECK_HEADERS([string.h sys/param.h unistd.h ])
75AC_CHECK_HEADERS([sys/sysctl.h])
76AC_CHECK_HEADERS([threads.h])
16AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
17
18# Support silent build rules. Requires at least automake-1.11.
19# Disable with "configure --disable-silent-rules" or "make V=1"
20m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
21
22AC_PROG_CC
23AM_PROG_AR

--- 45 unchanged lines hidden (view full) ---

69AC_CHECK_HEADERS([stdtime/tzfile.h])
70AC_CHECK_FUNCS([dlfunc])
71
72AC_CHECK_HEADERS([sys/time.h])
73AC_CHECK_HEADERS([ctype.h errno.h stdio.h stdlib.h])
74AC_CHECK_HEADERS([string.h sys/param.h unistd.h ])
75AC_CHECK_HEADERS([sys/sysctl.h])
76AC_CHECK_HEADERS([threads.h])
77AC_CHECK_HEADERS([monitor.h])
77
78dnl humanize_number(3) is a great function, but it's not standard.
79dnl Note Macosx has the function in libutil.a but doesn't ship the
80dnl header file, so I'll need to carry my own implementation. See:
81dnl https://devforums.apple.com/thread/271121
82AC_CHECK_HEADERS([libutil.h])
83AC_CHECK_LIB([util], [humanize_number],
84 [HAVE_HUMANIZE_NUMBER=$ac_cv_header_libutil_h],

--- 58 unchanged lines hidden (view full) ---

143else
144 GETTEXT_PREFIX=none
145 GETTEXT_CFLAGS=
146 GETTEXT_LIBS=
147fi
148AC_SUBST(GETTEXT_CFLAGS)
149AC_SUBST(GETTEXT_LIBS)
150
78
79dnl humanize_number(3) is a great function, but it's not standard.
80dnl Note Macosx has the function in libutil.a but doesn't ship the
81dnl header file, so I'll need to carry my own implementation. See:
82dnl https://devforums.apple.com/thread/271121
83AC_CHECK_HEADERS([libutil.h])
84AC_CHECK_LIB([util], [humanize_number],
85 [HAVE_HUMANIZE_NUMBER=$ac_cv_header_libutil_h],

--- 58 unchanged lines hidden (view full) ---

144else
145 GETTEXT_PREFIX=none
146 GETTEXT_CFLAGS=
147 GETTEXT_LIBS=
148fi
149AC_SUBST(GETTEXT_CFLAGS)
150AC_SUBST(GETTEXT_LIBS)
151
151GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
152AC_SUBST(GETTEXT_BINDIR)
153GETTEXT_LIBDIR=${GETTEXT_PREFIX}/lib
154AC_SUBST(GETTEXT_LIBDIR)
152GETTEXT_LIBDIR=${GETTEXT_PREFIX}/lib
153AC_SUBST(GETTEXT_LIBDIR)
154if test -x ${GETTEXT_PREFIX}/bin/msgfmt ; then
155 GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
156elif test -x ${GETTEXT_PREFIX}/local/bin/msgfmt ; then
157 GETTEXT_BINDIR=${GETTEXT_PREFIX}/local/bin
158else
159 AC_MSG_NOTICE("could not find msgfmt tool")
160 # Use a (bad) fall back value
161 GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
162fi
163AC_SUBST(GETTEXT_BINDIR)
155
156AM_CONDITIONAL([HAVE_GETTEXT], [test "$HAVE_GETTEXT" = "yes"])
157
158dnl Looking for how to do thread-local variables
159AC_ARG_WITH(threads,
160 [ --with-threads=[STYLE] Specify style of thread-local support (none)],
161 [THREAD_LOCAL=$withval],
162 [THREAD_LOCAL=unknown],

--- 119 unchanged lines hidden (view full) ---

282 [ --disable-wcwidth Disable local wcwidth implementation],
283 [LIBXO_WCWIDTH=$enableval],
284 [LIBXO_WCWIDTH=yes])
285AC_MSG_RESULT([$LIBXO_WCWIDTH])
286if test "${LIBXO_WCWIDTH}" != "no"; then
287 AC_DEFINE([LIBXO_WCWIDTH], [1], [Enable local wcwidth implementation])
288fi
289
164
165AM_CONDITIONAL([HAVE_GETTEXT], [test "$HAVE_GETTEXT" = "yes"])
166
167dnl Looking for how to do thread-local variables
168AC_ARG_WITH(threads,
169 [ --with-threads=[STYLE] Specify style of thread-local support (none)],
170 [THREAD_LOCAL=$withval],
171 [THREAD_LOCAL=unknown],

--- 119 unchanged lines hidden (view full) ---

291 [ --disable-wcwidth Disable local wcwidth implementation],
292 [LIBXO_WCWIDTH=$enableval],
293 [LIBXO_WCWIDTH=yes])
294AC_MSG_RESULT([$LIBXO_WCWIDTH])
295if test "${LIBXO_WCWIDTH}" != "no"; then
296 AC_DEFINE([LIBXO_WCWIDTH], [1], [Enable local wcwidth implementation])
297fi
298
299AC_MSG_CHECKING([retain hash bucket size])
300AC_ARG_WITH(retain-size,
301 [ --with-retain-size=[DIR] Specify retain hash bucket size (in bits)],
302 [XO_RETAIN_SIZE=$withval],
303 [XO_RETAIN_SIZE=default]
304)
305
306AC_MSG_RESULT([$XO_RETAIN_SIZE])
307if test "${XO_RETAIN_SIZE}" != "default"; then
308 AC_DEFINE_UNQUOTED([XO_RETAIN_SIZE], ${XO_RETAIN_SIZE}, [Retain hash bucket size])
309fi
310
290AC_CHECK_LIB([m], [lrint])
291AM_CONDITIONAL([HAVE_LIBM], [test "$HAVE_LIBM" != "no"])
292
293AC_MSG_CHECKING([compiler for gcc])
294HAVE_GCC=no
295if test "${CC}" != ""; then
296 HAVE_GCC=`${CC} --version 2>&1 | grep GCC`
297 if test "${HAVE_GCC}" != ""; then

--- 44 unchanged lines hidden (view full) ---

342 ;;
343esac
344
345XO_LIBS=-lxo
346XO_SRCDIR=${srcdir}
347XO_LIBDIR=${libdir}
348XO_BINDIR=${bindir}
349XO_INCLUDEDIR=${includedir}
311AC_CHECK_LIB([m], [lrint])
312AM_CONDITIONAL([HAVE_LIBM], [test "$HAVE_LIBM" != "no"])
313
314AC_MSG_CHECKING([compiler for gcc])
315HAVE_GCC=no
316if test "${CC}" != ""; then
317 HAVE_GCC=`${CC} --version 2>&1 | grep GCC`
318 if test "${HAVE_GCC}" != ""; then

--- 44 unchanged lines hidden (view full) ---

363 ;;
364esac
365
366XO_LIBS=-lxo
367XO_SRCDIR=${srcdir}
368XO_LIBDIR=${libdir}
369XO_BINDIR=${bindir}
370XO_INCLUDEDIR=${includedir}
371XO_CFLAGS="${CFLAGS}"
350
372
373AC_SUBST(XO_LIBS)
351AC_SUBST(XO_SRCDIR)
352AC_SUBST(XO_LIBDIR)
353AC_SUBST(XO_BINDIR)
354AC_SUBST(XO_INCLUDEDIR)
355AC_SUBST(XO_LIBEXT)
374AC_SUBST(XO_SRCDIR)
375AC_SUBST(XO_LIBDIR)
376AC_SUBST(XO_BINDIR)
377AC_SUBST(XO_INCLUDEDIR)
378AC_SUBST(XO_LIBEXT)
379AC_SUBST(XO_CFLAGS)
356
357AC_ARG_WITH(encoder-dir,
358 [ --with-encoder-dir=[DIR] Specify location of encoder libraries],
359 [XO_ENCODERDIR=$withval],
360 [XO_ENCODERDIR=$libdir/libxo/encoder]
361)
362AC_SUBST(XO_ENCODERDIR)
363

--- 80 unchanged lines hidden (view full) ---

444 debug: ${LIBXO_DEBUG:-no}
445 printf-like: ${HAVE_PRINTFLIKE:-no}
446 libxo-options: ${LIBXO_OPTS:-no}
447 text-only: ${LIBXO_TEXT_ONLY:-no}
448 gettext: ${HAVE_GETTEXT:-no} (${GETTEXT_PREFIX})
449 isthreaded: ${HAVE_ISTHREADED:-no}
450 thread-local: ${THREAD_LOCAL:-no}
451 local wcwidth: ${LIBXO_WCWIDTH:-no}
380
381AC_ARG_WITH(encoder-dir,
382 [ --with-encoder-dir=[DIR] Specify location of encoder libraries],
383 [XO_ENCODERDIR=$withval],
384 [XO_ENCODERDIR=$libdir/libxo/encoder]
385)
386AC_SUBST(XO_ENCODERDIR)
387

--- 80 unchanged lines hidden (view full) ---

468 debug: ${LIBXO_DEBUG:-no}
469 printf-like: ${HAVE_PRINTFLIKE:-no}
470 libxo-options: ${LIBXO_OPTS:-no}
471 text-only: ${LIBXO_TEXT_ONLY:-no}
472 gettext: ${HAVE_GETTEXT:-no} (${GETTEXT_PREFIX})
473 isthreaded: ${HAVE_ISTHREADED:-no}
474 thread-local: ${THREAD_LOCAL:-no}
475 local wcwidth: ${LIBXO_WCWIDTH:-no}
476 retain size: ${XO_RETAIN_SIZE:-no}
452])
477])