sim/bfin: include config/pkg.m4 in configure.ac

[thirdparty/binutils-gdb.git] / sim / bfin / configure.ac

diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index fddebc9ca099ec725a1457df3ec4987314bab5b8..47bacb1c0d2e8cb2d623bb7271bace8410e7da36 100644 (file)
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -1,20 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
 AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
+sinclude(../common/acinclude.m4)
+m4_include([../../config/pkg.m4])
 
-sinclude(../common/aclocal.m4)
+SIM_AC_COMMON
 
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
-
-SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
+SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_DEFAULT_MODEL(bf537)
-SIM_AC_OPTION_ENVIRONMENT
-SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_HARDWARE(yes,,\
        bfin_cec \
@@ -28,11 +21,14 @@ SIM_AC_OPTION_HARDWARE(yes,,\
        bfin_eppi \
        bfin_evt \
        bfin_gpio \
+       bfin_gpio2 \
        bfin_gptimer \
        bfin_jtag \
        bfin_mmu \
        bfin_nfc \
        bfin_otp \
+       bfin_pfmon \
+       bfin_pint \
        bfin_pll \
        bfin_ppi \
        bfin_rtc \
@@ -47,21 +43,15 @@ SIM_AC_OPTION_HARDWARE(yes,,\
        eth_phy \
 )
 
-AC_CHECK_FUNCS([getuid getgid geteuid getegid setuid setgid mmap munmap])
-AC_CHECK_HEADERS([sys/ioctl.h sys/mman.h net/if.h linux/if_tun.h linux/mii.h])
-
-BFIN_SIM_EXTRA_OBJS=
-
-dnl make sure the dv-sockser code can be supported (i.e. windows)
-case ${host} in
-  *mingw32*) ;;
-  *)
-    AC_DEFINE_UNQUOTED([HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
-    BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} dv-sockser.o"
-    ;;
-esac
-
-AC_SUBST([BFIN_SIM_EXTRA_OBJS], ${BFIN_SIM_EXTRA_OBJS})
+AC_CHECK_FUNCS([getuid getgid geteuid getegid setuid setgid mmap munmap kill pread])
+AC_CHECK_HEADERS([ \
+       linux/if_tun.h \
+       linux/mii.h \
+       linux/types.h \
+       net/if.h \
+       sys/ioctl.h \
+       sys/mman.h \
+])
 
 PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES(SDL, sdl, [