Commit 00068989 authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Added checks for HAL libraries.

parent a8569bf7
......@@ -505,6 +505,21 @@ then
CPPFLAGS="$ac_save_CPPFLAGS"
fi
dnl **** Check for libhal ****
AC_SUBST(HALINCL,"")
if test "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal`"
ac_hal_cflags="`$PKG_CONFIG --cflags hal`"
CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h],
[AC_CHECK_LIB(hal, libhal_ctx_new,
[AC_DEFINE(HAVE_LIBHAL, 1, [Define if you have the hal library])
HALINCL="$ac_hal_cflags"],,$ac_hal_libs)])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
dnl **** Check which curses lib to use ***
CURSESLIBS=""
if test "x$with_curses" != "xno"
......@@ -1169,6 +1184,8 @@ then
WINE_GET_SONAME(Xrandr,XRRQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS])
WINE_GET_SONAME(dbus-1,dbus_error_init)
WINE_GET_SONAME(hal,libhal_ctx_new)
WINE_GET_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
WINE_GET_SONAME(cups,cupsGetDefault)
WINE_GET_SONAME(jack,jack_client_new)
......
......@@ -56,6 +56,9 @@
/* Define if you have the daylight variable */
#undef HAVE_DAYLIGHT
/* Define to 1 if you have the <dbus/dbus.h> header file. */
#undef HAVE_DBUS_DBUS_H
/* Define to 1 if you have the <direct.h> header file. */
#undef HAVE_DIRECT_H
......@@ -218,6 +221,9 @@
/* Define to 1 if you have the <GL/gl.h> header file. */
#undef HAVE_GL_GL_H
/* Define to 1 if you have the <hal/libhal.h> header file. */
#undef HAVE_HAL_LIBHAL_H
/* Define to 1 if the ICU libraries are installed */
#undef HAVE_ICU
......@@ -284,6 +290,9 @@
/* Define if you have the curses library (-lcurses) */
#undef HAVE_LIBCURSES
/* Define if you have the hal library */
#undef HAVE_LIBHAL
/* Define to 1 if you have the `i386' library (-li386). */
#undef HAVE_LIBI386
......@@ -953,6 +962,9 @@
/* Define to the soname of the libcurses library. */
#undef SONAME_LIBCURSES
/* Define to the soname of the libdbus-1 library. */
#undef SONAME_LIBDBUS_1
/* Define to the soname of the libfontconfig library. */
#undef SONAME_LIBFONTCONFIG
......@@ -965,6 +977,9 @@
/* Define to the soname of the libGL library. */
#undef SONAME_LIBGL
/* Define to the soname of the libhal library. */
#undef SONAME_LIBHAL
/* Define to the soname of the libjack library. */
#undef SONAME_LIBJACK
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment