@@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE
1818AC_DEFINE_UNQUOTED ( PACKAGE , "$PACKAGE" , [ Package Name] )
1919AC_DEFINE_UNQUOTED ( VERSION , "$VERSION" , [ Package Version] )
2020
21- AC_CONFIG_HEADER ([ config.h] )
21+ AC_CONFIG_HEADERS ( [ config.h] )
2222AC_CONFIG_MACRO_DIR ( [ m4] )
2323
2424AH_BOTTOM ( [
142142AC_PROG_CXXCPP
143143
144144AC_PROG_INSTALL
145- AM_PROG_LEX
145+ dnl autoconf 2.69 AC_PROG_LEX has no parameters
146+ dnl autoconf 2.70 AC_PROG_LEX prints a deprecation warning without params
147+ m4_if ( m4_version_compare ( m4_defn ( [ AC_AUTOCONF_VERSION ] ) , [ 2.70] ) , [ -1] , [ dnl
148+ dnl autoconf < 2.70
149+ AM_PROG_LEX
150+ ] , [
151+ dnl autoconf >= 2.70
152+ AC_PROG_LEX ([ yywrap] )
153+ ] )
154+
146155AC_PROG_YACC
147156AM_CONDITIONAL(LEXYACC, test -n "$YACC")
148157
@@ -165,7 +174,6 @@ AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t],
165174# Checks for header files.
166175# ---------------------------------------------------------------------
167176AC_HEADER_DIRENT
168- AC_HEADER_STDC
169177AC_CHECK_HEADERS ( limits.h sys/time.h unistd.h )
170178AC_CHECK_HEADERS ( sys/types.h sys/socket.h netdb.h )
171179AC_CHECK_HEADERS ( sys/wait.h signal.h getopt.h )
@@ -177,7 +185,7 @@ AC_CHECK_HEADERS(png.h, AM_CONDITIONAL(HAVE_PNG,true), AM_CONDITIONAL(HAVE_PNG,
177185AC_C_CONST
178186AC_C_INLINE
179187AC_TYPE_SIZE_T
180- AC_HEADER_TIME
188+ AC_CHECK_HEADERS ( [ sys/time.h ] )
181189AC_STRUCT_TM
182190
183191# ---------------------------------------------------------------------
@@ -275,14 +283,14 @@ EXULT_CHECK_SDL(:,AC_MSG_ERROR([[*** SDL not found!]]))
275283
276284if test "x$PKG_CONFIG" != "x"; then
277285 PKG_CHECK_MODULES(OGG, ogg >= 1.0 vorbis >= 1.0.1 vorbisfile, , AC_MSG_ERROR ( [ *** must have Ogg/Vorbis installed!] ) )
278- else
279- dnl old school test
280- m4_ifdef ( [ XIPH_PATH_OGG] , [
281- XIPH_PATH_OGG(, AC_MSG_ERROR ( [ *** must have Ogg installed!] ) )
286+ else
287+ dnl old school test
288+ m4_ifdef ( [ XIPH_PATH_OGG] , [
289+ XIPH_PATH_OGG(, AC_MSG_ERROR ( [ *** must have Ogg installed!] ) )
282290 ] , AC_MSG_ERROR ( [ *** must have Ogg installed!] ) )
283- m4_ifdef ( [ XIPH_PATH_VORBIS] , [
284- XIPH_PATH_VORBIS(, AC_MSG_ERROR ( [ *** must have Vorbis installed!] ) )
285- ] , AC_MSG_ERROR ( [ *** must have Vorbis installed!] ) )
291+ m4_ifdef ( [ XIPH_PATH_VORBIS] , [
292+ XIPH_PATH_VORBIS(, AC_MSG_ERROR ( [ *** must have Vorbis installed!] ) )
293+ ] , AC_MSG_ERROR ( [ *** must have Vorbis installed!] ) )
286294fi
287295
288296# ---------------------------------------------------------------------
@@ -1263,11 +1271,11 @@ if test x$enable_fluidsynth = xyes; then
12631271 fi
12641272fi
12651273if test x$have_gtk = xyes; then
1266- echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
1267- echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
1274+ echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
1275+ echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
12681276fi
12691277if test x$have_gdk_pixbuf = xyes; then
1270- echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
1278+ echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
12711279fi
12721280echo
12731281echo Build tools................ : $enable_tools
@@ -1277,11 +1285,11 @@ echo Build Exult Studio......... : $enable_exult_studio
12771285echo Exult Studio support....... : $enable_exult_studio_support
12781286echo
12791287if test x$enable_all_hq_scalers = xyes; then
1280- echo Build all HQ scalers....... : $enable_all_hq_scalers
1288+ echo Build all HQ scalers....... : $enable_all_hq_scalers
12811289else
1282- echo Build HQ2X scaler.......... : $enable_hq2x
1283- echo Build HQ3X scaler.......... : $enable_hq3x
1284- echo Build HQ4X scaler.......... : $enable_hq4x
1290+ echo Build HQ2X scaler.......... : $enable_hq2x
1291+ echo Build HQ3X scaler.......... : $enable_hq3x
1292+ echo Build HQ4X scaler.......... : $enable_hq4x
12851293fi
12861294echo Build NxBR scalers......... : $enable_nxbr
12871295echo
0 commit comments