-])], [libmodplug_cv_works=yes], [libmodplug_cv_works=no])])
-])
-
-dnl CHECK_LIBMODPLUG([action-if-ok], [action-if-fail])
-AC_DEFUN([CHECK_LIBMODPLUG],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([LIBMODPLUG_CFLAGS], [C compiler flags for libmodplug])dnl
-AC_ARG_VAR([LIBMODPLUG_LIBS], [linker flags for libmodplug])dnl
-
-if test x"$PKG_CONFIG" != x; then
- AC_MSG_CHECKING([pkg-config database for libmodplug])
- _PKG_CONFIG([libmodplug_cflags], [cflags], [libmodplug])
- _PKG_CONFIG([libmodplug_libs], [libs], [libmodplug])
- if test x$pkg_failed = xyes; then
- errors=`$PKG_CONFIG --errors-to-stdout --print-errors libmodplug`
- echo "$errors" >&AS_MESSAGE_LOG_FD
- AC_MSG_RESULT([no])
- else
- if test x"$LIBMODPLUG_CFLAGS" = x; then
- LIBMODPLUG_CFLAGS=$pkg_cv_libmodplug_cflags
- fi
- if test x"$LIBMODPLUG_LIBS" = x; then
- LIBMODPLUG_LIBS=$pkg_cv_libmodplug_libs
- fi
-
- AC_MSG_RESULT([yes])
- fi
-fi
-
-if test x"$LIBMODPLUG_CFLAGS" = x; then
- LIBMODPLUG_CFLAGS="-I$includedir/libmodplug"
-fi
-
-if test x"$LIBMODPLUG_LIBS" = x; then
- LIBMODPLUG_LIBS=-lmodplug
-fi
-
-AC_LANG_PUSH([C])
-old_cflags=$CFLAGS
-old_libs=$LIBS
-CFLAGS="$LIBMODPLUG_CFLAGS $CFLAGS"
-LIBS="$LIBMODPLUG_LIBS $LIBS"
-
-_LIBMODPLUG_TEST
-
-CFLAGS=$old_cflags
-LIBS=$old_libs
-AC_LANG_POP([C])
-
-if test x"$libmodplug_cv_works" = x"yes"; then
- AC_SUBST([LIBMODPLUG_CFLAGS])
- AC_SUBST([LIBMODPLUG_LIBS])
- ifelse([$1], [], [true], [$1])
+])])
+
+dnl DX_CHECK_LIBMODPLUG([action-if-ok], [action-if-fail])
+AC_DEFUN([DX_CHECK_LIBMODPLUG],
+[DX_PKG_CONFIG([libmodplug], [libmodplug], [libmodplug])
+
+DX_CHECK_LIB([libmodplug],
+ [for libmodplug], [_DX_LIBMODPLUG_TEST_PROGRAM], [dnl
+ [[$LIBMODPLUG_CFLAGS], [$LIBMODPLUG_LIBS]],
+ [[$pkg_cv_libmodplug_cflags], [$pkg_cv_libmodplug_libs],
+ [test ! x"$pkg_failed" = x"yes"]],
+ [[], [-lmodplug]],
+ ])
+
+if test x"$dx_cv_libmodplug_found" = x"yes"; then
+ ifelse([$1], [], [:], [$1])