@@ -4,9 +4,9 @@ AC_PREREQ([2.69])
44# -------------------------------------------
55# PackageTimestamp, major version, minor version, and Nameslist.txt version
66# 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
88m4_define ( [ uninameslist_major_version] , [ 16] ) dnl Nameslist.txt
9- m4_define ( [ uninameslist_minor_version] , [ 0 ] )
9+ m4_define ( [ uninameslist_minor_version] , [ 9 ] )
1010m4_define ( [ uninameslist_nameslist_ver] , [ uninameslist_major_version.uninameslist_minor_version] )
1111# Libraries have a "libtool" version of the form current:revision:age.
1212m4_define ( [ uninameslist_current] , [ 1] )
@@ -17,11 +17,11 @@ m4_define([uninameslist_libver],
1717
1818# These values below are kept for backwards compatibility with older programs
1919# 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 ] )
2222m4_define ( [ uninameslist_fr_nameslist_ver] , [ fr_major_version.fr_minor_version] )
2323m4_define ( [ uninameslist_fr_current] , [ 1] )
24- m4_define ( [ uninameslist_fr_revision] ,[ 7 ] )
24+ m4_define ( [ uninameslist_fr_revision] ,[ 8 ] )
2525m4_define ( [ uninameslist_fr_age] , [ 0] )
2626m4_define ( [ uninameslist_fr_libver] ,
2727 [ uninameslist_fr_current:uninameslist_fr_revision:uninameslist_fr_age] )
@@ -57,6 +57,7 @@ AC_INIT([uninameslist],[uninameslist_package_stamp],[
[email protected] 5757AC_CONFIG_SRCDIR ( [ buildnameslist.c] )
5858# -------------------------------------------
5959AC_CONFIG_MACRO_DIR ( [ m4] )
60+ AC_CANONICAL_TARGET
6061AC_CANONICAL_HOST
6162AC_CANONICAL_BUILD
6263AM_INIT_AUTOMAKE ( [ foreign -Wall] )
@@ -71,6 +72,7 @@ AC_SUBST([LIBTOOL_DEPS])
7172
7273# Check building environment
7374AC_PROG_CC
75+ AC_ENABLE_SHARED
7476AC_PROG_LN_S
7577AC_PROG_MKDIR_P
7678AC_PROG_MAKE_SET
@@ -79,16 +81,6 @@ AC_CHECK_TOOL([WGET],[wget],[:])
7981AC_CHECK_TOOL ( [ STRIP] ,[ strip] ,[ :] )
8082AC_CHECK_TOOL ( [ TOUCH] ,[ touch] ,[ :] )
8183AC_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
9284
9385# -------------------------------------------
9486# Indicate this is a release build and that
@@ -132,7 +124,7 @@ AC_ARG_ENABLE([pylib],
132124if test x$enable_pylib = xyes ; then
133125 AC_ARG_VAR ( [ PYTHON] ,[ Python to use to build the python wheel.] )
134126 if test x"${PYTHON}" = x; then
135- PYTHON=python
127+ PYTHON=python3
136128 fi
137129 AC_CHECK_PROG ( [ PYTHONFOUND] ,[ ${PYTHON}] ,[ yes] )
138130 if test x"${PYTHONFOUND}" != xyes; then
@@ -226,14 +218,6 @@ AC_SUBST([UN_LIB])
226218AC_SUBST ( [ WCFLAGS] )
227219AC_SUBST ( [ WUNLIB] )
228220
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-
237221# -------------------------------------------
238222AC_CONFIG_FILES ( [
239223Makefile
@@ -242,6 +226,17 @@ tests/Makefile
242226libuninameslist.pc
243227] )
244228
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+
245240AC_OUTPUT
246241
247242AC_MSG_NOTICE ( [
0 commit comments