@@ -4,9 +4,9 @@ AC_PREREQ([2.69])
4
4
# -------------------------------------------
5
5
# PackageTimestamp, major version, minor version, and Nameslist.txt version
6
6
# Libraries have a "package" version of the form major.minor.micro.
7
- m4_define ( [ uninameslist_package_stamp] , [ 20240910 ] ) dnl yyyymmdd
7
+ m4_define ( [ uninameslist_package_stamp] , [ 20250714 ] ) dnl yyyymmdd
8
8
m4_define ( [ uninameslist_major_version] , [ 16] ) dnl Nameslist.txt
9
- m4_define ( [ uninameslist_minor_version] , [ 0 ] )
9
+ m4_define ( [ uninameslist_minor_version] , [ 9 ] )
10
10
m4_define ( [ uninameslist_nameslist_ver] , [ uninameslist_major_version.uninameslist_minor_version] )
11
11
# Libraries have a "libtool" version of the form current:revision:age.
12
12
m4_define ( [ uninameslist_current] , [ 1] )
@@ -17,11 +17,11 @@ m4_define([uninameslist_libver],
17
17
18
18
# These values below are kept for backwards compatibility with older programs
19
19
# that are using the French namesList. This increments with ListeDesNoms.txt.
20
- m4_define ( [ fr_major_version] , [ 15 ] ) dnl latest ListeDesNoms.txt = ver15 .0
21
- m4_define ( [ fr_minor_version] , [ 1 ] )
20
+ m4_define ( [ fr_major_version] , [ 16 ] ) dnl latest ListeDesNoms.txt = ver16 .0
21
+ m4_define ( [ fr_minor_version] , [ 0 ] )
22
22
m4_define ( [ uninameslist_fr_nameslist_ver] , [ fr_major_version.fr_minor_version] )
23
23
m4_define ( [ uninameslist_fr_current] , [ 1] )
24
- m4_define ( [ uninameslist_fr_revision] ,[ 7 ] )
24
+ m4_define ( [ uninameslist_fr_revision] ,[ 8 ] )
25
25
m4_define ( [ uninameslist_fr_age] , [ 0] )
26
26
m4_define ( [ uninameslist_fr_libver] ,
27
27
[ uninameslist_fr_current:uninameslist_fr_revision:uninameslist_fr_age] )
@@ -57,6 +57,7 @@ AC_INIT([uninameslist],[uninameslist_package_stamp],[
[email protected]
57
57
AC_CONFIG_SRCDIR ( [ buildnameslist.c] )
58
58
# -------------------------------------------
59
59
AC_CONFIG_MACRO_DIR ( [ m4] )
60
+ AC_CANONICAL_TARGET
60
61
AC_CANONICAL_HOST
61
62
AC_CANONICAL_BUILD
62
63
AM_INIT_AUTOMAKE ( [ foreign -Wall] )
@@ -71,6 +72,7 @@ AC_SUBST([LIBTOOL_DEPS])
71
72
72
73
# Check building environment
73
74
AC_PROG_CC
75
+ AC_ENABLE_SHARED
74
76
AC_PROG_LN_S
75
77
AC_PROG_MKDIR_P
76
78
AC_PROG_MAKE_SET
@@ -79,16 +81,6 @@ AC_CHECK_TOOL([WGET],[wget],[:])
79
81
AC_CHECK_TOOL ( [ STRIP] ,[ strip] ,[ :] )
80
82
AC_CHECK_TOOL ( [ TOUCH] ,[ touch] ,[ :] )
81
83
AC_PROG_INSTALL
82
- case "$host" in
83
- *-pc-cygwin*)
84
- AC_DEFINE ( __CygWin ,1 )
85
- LT_INIT([ win32-dll] )
86
- ;;
87
- *)
88
- LT_INIT()
89
- ;;
90
- esac
91
- AC_ENABLE_SHARED
92
84
93
85
# -------------------------------------------
94
86
# Indicate this is a release build and that
@@ -132,7 +124,7 @@ AC_ARG_ENABLE([pylib],
132
124
if test x$enable_pylib = xyes ; then
133
125
AC_ARG_VAR ( [ PYTHON] ,[ Python to use to build the python wheel.] )
134
126
if test x"${PYTHON}" = x; then
135
- PYTHON=python
127
+ PYTHON=python3
136
128
fi
137
129
AC_CHECK_PROG ( [ PYTHONFOUND] ,[ ${PYTHON}] ,[ yes] )
138
130
if test x"${PYTHONFOUND}" != xyes; then
@@ -226,14 +218,6 @@ AC_SUBST([UN_LIB])
226
218
AC_SUBST ( [ WCFLAGS] )
227
219
AC_SUBST ( [ WUNLIB] )
228
220
229
- # -------------------------------------------
230
- # Ensure fresh timestamps if run ./configure
231
- echo 'const char NL_VERSION[ [ ] ] = "uninameslist_nameslist_ver";' > ${builddir}buildnameslist.h
232
- echo 'const char NFR_VERSION[ [ ] ] = "uninameslist_fr_nameslist_ver";' >> ${builddir}buildnameslist.h
233
- rm -f ${top_builddir}tests/call-test.h
234
- echo 'const char NL_VERSION[ [ ] ] = "Nameslist-Version: uninameslist_nameslist_ver";' > ${top_builddir}tests/call-test.h
235
- echo 'const char NFR_VERSION[ [ ] ] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> ${top_builddir}tests/call-test.h
236
-
237
221
# -------------------------------------------
238
222
AC_CONFIG_FILES ( [
239
223
Makefile
@@ -242,6 +226,17 @@ tests/Makefile
242
226
libuninameslist.pc
243
227
] )
244
228
229
+ # -------------------------------------------
230
+ # Ensure fresh timestamps if run ./configure
231
+ make clean
232
+ echo '/* This file was generated by 'configure' */' > ${builddir}buildnameslist.h
233
+ echo 'const char NL_VERSION[ [ ] ] = "uninameslist_nameslist_ver";' >> ${builddir}buildnameslist.h
234
+ echo 'const char NFR_VERSION[ [ ] ] = "uninameslist_fr_nameslist_ver";' >> ${builddir}buildnameslist.h
235
+ rm -f ${top_builddir}tests/call-test.h
236
+ echo '/* This file was generated by 'configure' */' > ${top_builddir}tests/call-test.h
237
+ echo 'const char NL_VERSION[ [ ] ] = "Nameslist-Version: uninameslist_nameslist_ver";' >> ${top_builddir}tests/call-test.h
238
+ echo 'const char NFR_VERSION[ [ ] ] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> ${top_builddir}tests/call-test.h
239
+
245
240
AC_OUTPUT
246
241
247
242
AC_MSG_NOTICE ( [
0 commit comments