summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure659
1 files changed, 447 insertions, 212 deletions
diff --git a/configure b/configure
index 1ba3330..88defeb 100755
--- a/configure
+++ b/configure
@@ -19,7 +19,7 @@ ac_help="$ac_help
ac_help="$ac_help
--disable-nls do not use Native Language Support"
ac_help="$ac_help
- --with-gnu-gettext use the GNU gettext library"
+ --with-included-gettext use the GNU gettext library included here"
ac_help="$ac_help
--with-catgets use catgets functions if available"
@@ -550,7 +550,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
##############################################################################
PACKAGE=id-utils
-VERSION=3.0.9
+VERSION=3.1
PACKAGE_VERSION="$PACKAGE-$VERSION"
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
@@ -593,8 +593,8 @@ fi
ALL_LINGUAS="de fr"
case $VERSION in
-*.*.*) README_ALPHA=README-alpha;;
-*) README_ALPHA=;;
+*[a-z]) README_ALPHA=README-alpha;;
+*) README_ALPHA=;;
esac
@@ -1419,7 +1419,7 @@ EOF
fi
-for ac_hdr in limits.h sys/types.h sys/param.h stdlib.h unistd.h string.h
+for ac_hdr in sys/types.h sys/param.h sys/stat.h sys/ioctl.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1456,7 +1456,7 @@ else
fi
done
-for ac_hdr in malloc.h sys/ioctl.h termios.h termio.h sgtty.h regex.h
+for ac_hdr in limits.h stddef.h stdlib.h unistd.h string.h fcntl.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1493,6 +1493,43 @@ else
fi
done
+for ac_hdr in malloc.h termios.h termio.h sgtty.h regex.h memory.h
+do
+ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1505 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
##############################################################################
################ Check for typedefs, structs, and compiler params ############
@@ -1503,7 +1540,7 @@ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1507 "configure"
+#line 1544 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1553,7 +1590,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1588,7 +1625,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
do
CFLAGS="$ac_save_CFLAGS $ac_arg"
cat > conftest.$ac_ext <<EOF
-#line 1592 "configure"
+#line 1629 "configure"
#include "confdefs.h"
#if !defined(__STDC__) || __STDC__ != 1
choke me
@@ -1596,12 +1633,15 @@ choke me
int main() { return 0; }
int t() {
+/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
+#include <sys/types.h>
+#include <sys/stat.h>
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_prog_cc_stdc="$ac_arg"; break
fi
@@ -1637,7 +1677,7 @@ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1641 "configure"
+#line 1681 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1655,7 +1695,7 @@ int t() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1677,7 +1717,7 @@ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1681 "configure"
+#line 1721 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1708,7 +1748,7 @@ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1712 "configure"
+#line 1752 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1734,12 +1774,45 @@ EOF
fi
+echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1783 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+#include <sys/types.h>
+int main() { return 0; }
+int t() {
+ptrdiff_t p
+; return 0; }
+EOF
+if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_type_ptrdiff_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_ptrdiff_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_ptrdiff_t" 1>&6
+ if test $ac_cv_type_ptrdiff_t = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTRDIFF_T 1
+EOF
+
+ fi
+
##############################################################################
################ Set default compilation flags ###############################
##############################################################################
-: ${CFLAGS=-g}
+: ${CFLAGS="-O -g"}
: ${LDFLAGS=-g}
@@ -1755,7 +1828,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1759 "configure"
+#line 1832 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() { return 0; }
@@ -1763,7 +1836,7 @@ int t() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1787,7 +1860,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1791 "configure"
+#line 1864 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1811,7 +1884,7 @@ int t() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -1846,7 +1919,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1923 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1875,7 +1948,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1879 "configure"
+#line 1952 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1899,7 +1972,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1931,7 +2004,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1935 "configure"
+#line 2008 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1950,7 +2023,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-{ (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_stack_direction=1
else
@@ -1967,118 +2040,136 @@ EOF
fi
-echo $ac_n "checking for sbrk declaration in unistd.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_decl_sbrk'+set}'`\" = set"; then
+echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
+# Check whether --with-regex or --without-regex was given.
+if test "${with_regex+set}" = set; then
+ withval="$with_regex"
+ if test "$withval" = yes; then
+ ac_with_regex=1
+ echo "$ac_t""regex" 1>&6
+ cat >> confdefs.h <<\EOF
+#define WITH_REGEX 1
+EOF
+
+ REGEXOBJ=regex.o
+fi
+fi
+
+if test -z "$ac_with_regex"; then
+ echo "$ac_t""rx" 1>&6
+ echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1976 "configure"
+#line 2066 "configure"
#include "confdefs.h"
-#include <unistd.h>
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char re_rx_search(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char re_rx_search();
+
+int main() { return 0; }
+int t() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_re_rx_search) || defined (__stub___re_rx_search)
+choke me
+#else
+re_rx_search();
+#endif
+
+; return 0; }
EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "sbrk" >/dev/null 2>&1; then
+if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- ac_cv_decl_sbrk=yes
+ eval "ac_cv_func_re_rx_search=yes"
else
rm -rf conftest*
- ac_cv_decl_sbrk=no
+ eval "ac_cv_func_re_rx_search=no"
fi
rm -f conftest*
fi
-
-echo "$ac_t""$ac_cv_decl_sbrk" 1>&6
-if test $ac_cv_decl_sbrk = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_DECL_SBRK 1
-EOF
+if eval "test \"`echo '$ac_cv_func_'re_rx_search`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+REGEXOBJ=rx.o
+fi
fi
-echo $ac_n "checking for sys_errlist declaration""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_decl_sys_errlist'+set}'`\" = set"; then
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_cv_decl_sys_errlist=no
cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2115 "configure"
#include "confdefs.h"
-#include <errno.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "sys_errlist" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_decl_sys_errlist=yes
-fi
-rm -f conftest*
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vprintf(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char vprintf();
- cat > conftest.$ac_ext <<EOF
-#line 2018 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "sys_errlist" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_decl_sys_errlist=yes
-fi
-rm -f conftest*
+int main() { return 0; }
+int t() {
- cat > conftest.$ac_ext <<EOF
-#line 2030 "configure"
-#include "confdefs.h"
-#include <error.h>
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
+choke me
+#else
+vprintf();
+#endif
+
+; return 0; }
EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "sys_errlist" >/dev/null 2>&1; then
+if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+else
rm -rf conftest*
- ac_cv_decl_sys_errlist=yes
+ eval "ac_cv_func_vprintf=no"
fi
rm -f conftest*
-
fi
-
-echo "$ac_t""$ac_cv_decl_sys_errlist" 1>&6
-if test $ac_cv_decl_sys_errlist = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_DECL_SYS_ERRLIST 1
-EOF
-
-fi
-
-echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
-# Check whether --with-regex or --without-regex was given.
-if test "${with_regex+set}" = set; then
- withval="$with_regex"
- if test "$withval" = yes; then
- ac_with_regex=1
- echo "$ac_t""regex" 1>&6
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
-#define WITH_REGEX 1
+#define HAVE_VPRINTF 1
EOF
- REGEXOBJ=regex.o
-fi
+else
+ echo "$ac_t""no" 1>&6
fi
-if test -z "$ac_with_regex"; then
- echo "$ac_t""rx" 1>&6
- echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2074 "configure"
+#line 2165 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char re_rx_search(); below. */
+ which can conflict with char _doprnt(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char re_rx_search();
+char _doprnt();
int main() { return 0; }
int t() {
@@ -2086,42 +2177,44 @@ int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_re_rx_search) || defined (__stub___re_rx_search)
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
choke me
#else
-re_rx_search();
+_doprnt();
#endif
; return 0; }
EOF
-if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_func_re_rx_search=yes"
+ eval "ac_cv_func__doprnt=yes"
else
rm -rf conftest*
- eval "ac_cv_func_re_rx_search=no"
+ eval "ac_cv_func__doprnt=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'re_rx_search`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
echo "$ac_t""yes" 1>&6
- :
+ cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
else
echo "$ac_t""no" 1>&6
-REGEXOBJ=rx.o
fi
fi
-for ac_func in getwd getcwd link
+for ac_func in getwd getcwd link strerror isascii bcopy bzero memcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2125 "configure"
+#line 2218 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2145,7 +2238,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2167,14 +2260,14 @@ else
fi
done
-for ac_func in strcasecmp strdup strndup strtok fnmatch
+for ac_func in strdup strndup strspn strcspn strpbrk strstr strtok
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+#line 2271 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2198,7 +2291,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2218,14 +2311,14 @@ fi
done
-for ac_func in basename dirname error memcpy memset
+for ac_func in basename dirname fnmatch error memcpy memset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2229 "configure"
+#line 2322 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2249,7 +2342,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2274,7 +2367,7 @@ if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2278 "configure"
+#line 2371 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt_long(); below. */
@@ -2298,7 +2391,7 @@ getopt_long();
; return 0; }
EOF
-if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_getopt_long=yes"
else
@@ -2322,7 +2415,7 @@ if eval "test \"`echo '$''{'gt_cv_func_obstack'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
+#line 2419 "configure"
#include "confdefs.h"
#include "obstack.h"
int main() { return 0; }
@@ -2330,7 +2423,7 @@ int t() {
struct obstack *mem;obstack_free(mem,NULL)
; return 0; }
EOF
-if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
gt_cv_func_obstack=yes
else
@@ -2358,7 +2451,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 2362 "configure"
+#line 2455 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -2366,7 +2459,7 @@ int t() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:2370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
fi
@@ -2396,7 +2489,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2400 "configure"
+#line 2493 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2420,7 +2513,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2450,7 +2543,7 @@ else
ac_cv_func_mmap=no
else
cat > conftest.$ac_ext <<EOF
-#line 2454 "configure"
+#line 2547 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. */
@@ -2519,7 +2612,7 @@ main()
}
EOF
-{ (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_mmap=yes
else
@@ -2538,7 +2631,8 @@ EOF
fi
- for ac_hdr in limits.h locale.h nl_types.h malloc.h string.h unistd.h values.h
+ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h values.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2546,12 +2640,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2550 "configure"
+#line 2644 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2575,14 +2669,15 @@ else
fi
done
- for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp
+ for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
+__argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2586 "configure"
+#line 2681 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2606,7 +2701,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2637,7 +2732,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2641 "configure"
+#line 2736 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2661,7 +2756,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2697,7 +2792,7 @@ if eval "test \"`echo '$''{'ud_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2701 "configure"
+#line 2796 "configure"
#include "confdefs.h"
#include <locale.h>
int main() { return 0; }
@@ -2705,7 +2800,7 @@ int t() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ud_cv_val_LC_MESSAGES=yes
else
@@ -2736,15 +2831,17 @@ fi
echo "$ac_t""$USE_NLS" 1>&6
+ USE_INCLUDED_LIBINTL=no
+
if test "$USE_NLS" = "yes"; then
cat >> confdefs.h <<\EOF
#define ENABLE_NLS 1
EOF
echo $ac_n "checking for explicitly using GNU gettext""... $ac_c" 1>&6
- # Check whether --with-gnu-gettext or --without-gnu-gettext was given.
-if test "${with_gnu_gettext+set}" = set; then
- withval="$with_gnu_gettext"
+ # Check whether --with-included-gettext or --without-included-gettext was given.
+if test "${with_included_gettext+set}" = set; then
+ withval="$with_included_gettext"
nls_cv_force_use_gnu_gettext=$withval
else
nls_cv_force_use_gnu_gettext=no
@@ -2764,12 +2861,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2768 "configure"
+#line 2865 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2784,22 +2881,26 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for -lintl""... $ac_c" 1>&6
-ac_lib_var=`echo intl'_'main | tr './+\055' '__p_'`
+ac_lib_var=`echo intl'_'bindtextdomain | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2795 "configure"
+#line 2892 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char bindtextdomain();
int main() { return 0; }
int t() {
-main()
+bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2828,7 +2929,7 @@ if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2832 "configure"
+#line 2933 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -2852,7 +2953,7 @@ gettext();
; return 0; }
EOF
-if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_gettext=yes"
else
@@ -2883,8 +2984,10 @@ else
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+ break
+ fi
fi
done
IFS="$ac_save_ifs"
@@ -2898,11 +3001,6 @@ if test -n "$MSGFMT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $MSGFMT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's msgfmt. (Better remove it.)" >&6
- ac_cv_path_MSGFMT=msgfmt
- MSGFMT=msgfmt
- fi
if test "$MSGFMT" != "no"; then
for ac_func in dcgettext
do
@@ -2911,7 +3009,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
+#line 3013 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2935,7 +3033,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2987,11 +3085,6 @@ if test -n "$GMSGFMT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $GMSGFMT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's gmsgfmt. (Better remove it.)" >&6
- ac_cv_path_GMSGFMT=gmsgfmt
- GMSGFMT=gmsgfmt
- fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -3008,8 +3101,10 @@ else
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+ break
+ fi
fi
done
IFS="$ac_save_ifs"
@@ -3023,15 +3118,29 @@ if test -n "$XGETTEXT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $XGETTEXT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6
- ac_cv_path_XGETTEXT=xgettext
- XGETTEXT=xgettext
- fi
- CATOBJEXT=.mo
+ cat > conftest.$ac_ext <<EOF
+#line 3124 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
+; return 0; }
+EOF
+if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+else
+ rm -rf conftest*
+ CATOBJEXT=.mo
+ DATADIRNAME=lib
+fi
+rm -f conftest*
+
INSTOBJEXT=.mo
- DATADIRNAME=lib
fi
else
echo "$ac_t""no" 1>&6
@@ -3063,7 +3172,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-li $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3067 "configure"
+#line 3176 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -3071,7 +3180,7 @@ int t() {
main()
; return 0; }
EOF
-if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3100,7 +3209,7 @@ if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3104 "configure"
+#line 3213 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char catgets(); below. */
@@ -3124,7 +3233,7 @@ catgets();
; return 0; }
EOF
-if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:3237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_catgets=yes"
else
@@ -3172,10 +3281,8 @@ else
echo "$ac_t""no" 1>&6
fi
if test "$GENCAT" != "no"; then
- for ac_prog in gmsgfmt msgfmt
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3194,6 +3301,7 @@ else
fi
done
IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
;;
esac
fi
@@ -3204,10 +3312,41 @@ else
echo "$ac_t""no" 1>&6
fi
-test -n "$GMSGFMT" && break
-done
-test -n "$GMSGFMT" || GMSGFMT="msgfmt"
+ if test "$GMSGFMT" = "no"; then
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$GMSGFMT" in
+ /*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+ ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
+ ;;
+esac
+fi
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+ echo "$ac_t""$GMSGFMT" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -3223,8 +3362,10 @@ else
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+ break
+ fi
fi
done
IFS="$ac_save_ifs"
@@ -3238,18 +3379,13 @@ if test -n "$XGETTEXT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $XGETTEXT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6
- ac_cv_path_XGETTEXT=xgettext
- XGETTEXT=xgettext
- fi
+ USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
DATADIRNAME=lib
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
- INTLSUB=intl
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
@@ -3283,8 +3419,10 @@ else
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+ break
+ fi
fi
done
IFS="$ac_save_ifs"
@@ -3298,11 +3436,6 @@ if test -n "$MSGFMT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $MSGFMT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's msgfmt. (Better remove it.)" >&6
- ac_cv_path_MSGFMT=msgfmt
- MSGFMT=msgfmt
- fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -3334,11 +3467,6 @@ if test -n "$GMSGFMT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $GMSGFMT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's gmsgfmt. (Better remove it.)" >&6
- ac_cv_path_GMSGFMT=gmsgfmt
- GMSGFMT=gmsgfmt
- fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -3355,8 +3483,10 @@ else
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+ break
+ fi
fi
done
IFS="$ac_save_ifs"
@@ -3370,19 +3500,14 @@ if test -n "$XGETTEXT"; then
else
echo "$ac_t""no" 1>&6
fi
- if echo $XGETTEXT | grep openwin > /dev/null; then
- echo "WARNING: Do not use OpenWin's xgettext. (Better remove it.)" >&6
- ac_cv_path_XGETTEXT=xgettext
- XGETTEXT=xgettext
- fi
+ USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INSTOBJEXT=.mo
DATADIRNAME=share
- INTLDEPS="../intl/libintl.a"
- INTLLIBS=$INTLDEPS
- INTLSUB=intl
+ INTLDEPS="../intl/libintl.a"
+ INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
@@ -3405,6 +3530,13 @@ fi
nls_cv_header_libgt=intl/libgettext.h
fi
+ # If this is used in GNU gettext we have to set USE_NLS to `yes'
+ # because some of the sources are only built for this goal.
+ if test "$PACKAGE" = gettext; then
+ USE_NLS=yes
+ USE_INCLUDED_LIBINTL=yes
+ fi
+
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
@@ -3451,12 +3583,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3455 "configure"
+#line 3587 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3482,6 +3614,25 @@ fi
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+ if test "$PACKAGE" = "gettext"; then
+ GT_NO="#NO#"
+ GT_YES=
+ else
+ GT_NO=
+ GT_YES="#YES#"
+ fi
+
+
+
+ MKINSTALLDIRS=
+ if test $ac_aux_dir; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z $MKINSTALLDIRS; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+
+
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -3498,6 +3649,83 @@ fi
##############################################################################
+################ Find a home for language map ################################
+##############################################################################
+
+if test "x$prefix" != xNONE; then
+ datadir=$prefix/share
+else
+ datadir=$ac_default_prefix/share
+fi
+LANGUAGE_MAP_FILE=$datadir/id-lang.map
+cat >> confdefs.h <<EOF
+#define LANGUAGE_MAP_FILE "$LANGUAGE_MAP_FILE"
+EOF
+
+
+
+##############################################################################
+################ Find a home for Emacs Lisp code #############################
+##############################################################################
+
+# Extract the first word of "emacs", so it can be a program name with args.
+set dummy emacs; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$EMACS" in
+ /*)
+ ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_EMACS="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_EMACS" && ac_cv_path_EMACS="no"
+ ;;
+esac
+fi
+EMACS="$ac_cv_path_EMACS"
+if test -n "$EMACS"; then
+ echo "$ac_t""$EMACS" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $EMACS != "no"; then
+ echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
+ LISPDIR="\$(datadir)/emacs/site-lisp"
+ if test "x$prefix" = "xNONE"; then
+ if test -d $ac_default_prefix/share/emacs/site-lisp; then
+ LISPDIR="\$(prefix)/share/emacs/site-lisp"
+ else
+ if test -d $ac_default_prefix/lib/emacs/site-lisp; then
+ LISPDIR="\$(prefix)/lib/emacs/site-lisp"
+ fi
+ fi
+ else
+ if test -d $prefix/share/emacs/site-lisp; then
+ LISPDIR="\$(prefix)/share/emacs/site-lisp"
+ else
+ if test -d $prefix/lib/emacs/site-lisp; then
+ LISPDIR="\$(prefix)/lib/emacs/site-lisp"
+ fi
+ fi
+ fi
+ echo "$ac_t""$LISPDIR" 1>&6
+ ELCFILES="\$(ELCFILES)"
+ fi
+
+
+
+##############################################################################
################ Generate the configure script ###############################
##############################################################################
@@ -3588,7 +3816,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile doc/Makefile lib/Makefile src/Makefile intl/Makefile po/Makefile.in config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile doc/Makefile lib/Makefile libidu/Makefile src/Makefile lisp/Makefile intl/Makefile po/Makefile.in testsuite/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -3641,6 +3869,7 @@ s%@MSGFMT@%$MSGFMT%g
s%@GMSGFMT@%$GMSGFMT%g
s%@XGETTEXT@%$XGETTEXT%g
s%@GENCAT@%$GENCAT%g
+s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
s%@CATALOGS@%$CATALOGS%g
s%@CATOBJEXT@%$CATOBJEXT%g
s%@DATADIRNAME@%$DATADIRNAME%g
@@ -3649,15 +3878,21 @@ s%@INSTOBJEXT@%$INSTOBJEXT%g
s%@INTLDEPS@%$INTLDEPS%g
s%@INTLLIBS@%$INTLLIBS%g
s%@INTLOBJS@%$INTLOBJS%g
-s%@INTLSUB@%$INTLSUB%g
s%@POFILES@%$POFILES%g
s%@POSUB@%$POSUB%g
+s%@GT_NO@%$GT_NO%g
+s%@GT_YES@%$GT_YES%g
+s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
+s%@LANGUAGE_MAP_FILE@%$LANGUAGE_MAP_FILE%g
+s%@EMACS@%$EMACS%g
+s%@LISPDIR@%$LISPDIR%g
+s%@ELCFILES@%$ELCFILES%g
CEOF
EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile lib/Makefile src/Makefile intl/Makefile po/Makefile.in"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile lib/Makefile libidu/Makefile src/Makefile lisp/Makefile intl/Makefile po/Makefile.in testsuite/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 15:14:58 +0000