Revision | 75ac4ac2c04f5e2ae723d6fbcaa4160d430d3e5c (tree) |
---|---|
Time | 2023-01-30 21:00:26 |
Author | Ruben Agin <phabrics@phab...> |
Commiter | Ruben Agin |
Some autoconfig updates.
@@ -32,7 +32,7 @@ dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
32 | 32 | dnl POSSIBILITY OF SUCH DAMAGE. |
33 | 33 | |
34 | 34 | dnl Checks that we are given a good source directory. |
35 | -AC_PREREQ([2.69]) | |
35 | +AC_PREREQ([2.71]) | |
36 | 36 | m4_include(version.m4) |
37 | 37 | AC_INIT([tme],[0.12rc10]) |
38 | 38 | AC_CONFIG_SRCDIR([ic/m68k/m68k-impl.h]) |
@@ -56,6 +56,7 @@ AC_PROG_CPP | ||
56 | 56 | AC_PROG_YACC |
57 | 57 | AC_PROG_INSTALL |
58 | 58 | AC_PROG_MAKE_SET |
59 | +AC_PROG_EGREP | |
59 | 60 | |
60 | 61 | AC_DEFINE_UNQUOTED([TARGET_ALIAS], ["${host}"], [A string representing our host]) |
61 | 62 | case "${host_os}" in |
@@ -164,7 +165,6 @@ LIBS=$OLDLIBS | ||
164 | 165 | AC_SUBST(NATLIBS) |
165 | 166 | |
166 | 167 | dnl Checks for header files. |
167 | -AC_HEADER_STDC | |
168 | 168 | AC_CHECK_HEADERS([unistd.h stdio.h memory.h stdarg.h stdbool.h limits.h float.h]) |
169 | 169 | AC_CHECK_HEADERS([sys/ioctl.h sys/sockio.h sys/socketio.h net/if_dl.h ioctls.h netpacket/packet.h ifaddrs.h]) |
170 | 170 | AC_CHECK_HEADERS([byteswap.h sys/endian.h]) |
@@ -793,11 +793,11 @@ dnl Start the list of display host support. | ||
793 | 793 | TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff" |
794 | 794 | |
795 | 795 | dnl Checks for GLIB. |
796 | -AM_PATH_GLIB_2_0([], [AC_DEFINE([HAVE_GLIB], [], [Defined if GLIB 2.0 is found.])], []) | |
796 | +PKG_CHECK_MODULES([GLIB], [glib-2.0], [AC_DEFINE([HAVE_GLIB], [], [Defined if GLIB 2.0 is found.])], []) | |
797 | 797 | |
798 | 798 | dnl Checks for display type support |
799 | -AM_PATH_GTK_3_0([], [have_gtk=$enable_gtk], []) | |
800 | -AM_PATH_SDL2([], [have_sdl=$enable_sdl], []) | |
799 | +PKG_CHECK_MODULES([GTK], [gtk+-3.0], [have_gtk=$enable_gtk], []) | |
800 | +PKG_CHECK_MODULES([SDL], [sdl2], [have_sdl=$enable_sdl], []) | |
801 | 801 | AM_CONDITIONAL([HAVE_SDL], [test "x${have_sdl}" = xyes]) |
802 | 802 | PKG_CHECK_MODULES([RFB], [libvncclient libvncserver], [have_rfb=$enable_rfb], []) |
803 | 803 |
@@ -953,7 +953,7 @@ AC_SUBST(TME_FB_XLAT_SRC) | ||
953 | 953 | |
954 | 954 | dnl Checks for X11. |
955 | 955 | AC_PATH_XTRA |
956 | -AC_PERL_MODULE_VERSION(X11::Protocol 0.56, [], no_x=yes) | |
956 | +AX_PERL_MODULE_VERSION([X11::Protocol 0.56],[],[no_x=yes]) | |
957 | 957 | AM_CONDITIONAL([USING_X], [test "x${no_x}" = x]) |
958 | 958 | |
959 | 959 | dnl Configure recode. |
@@ -1073,11 +1073,13 @@ fi | ||
1073 | 1073 | |
1074 | 1074 | |
1075 | 1075 | dnl Configure for libtool. |
1076 | -#AC_LIBLTDL_INSTALLABLE | |
1076 | +#_LT_CONFIG_LTDL_DIR([m4_default([], [libltdl])]) | |
1077 | +_LTDL_INSTALLABLE | |
1077 | 1078 | #AC_SUBST(INCLTDL) |
1078 | 1079 | #AC_SUBST(LIBLTDL) |
1079 | -#AC_LIBTOOL_DLOPEN | |
1080 | -#AM_PROG_LIBTOOL | |
1080 | +#_LT_SET_OPTION([LT_INIT],[dlopen]) | |
1081 | + | |
1082 | +LT_INIT([dlopen]) | |
1081 | 1083 | #AC_SUBST(LTLIBOBJS) |
1082 | 1084 | #AC_CONFIG_SUBDIRS(libltdl) |
1083 | 1085 | LT_PREREQ([2.4]) |