]> git.pld-linux.org Git - packages/hal.git/blob - hal-link.patch
- updated link patch to remove libsmbios from libhal and libhal-storage linking
[packages/hal.git] / hal-link.patch
1 --- hal-0.5.10/configure.in.orig        2007-10-31 20:02:08.847844000 +0100
2 +++ hal-0.5.10/configure.in     2007-10-31 20:20:27.462450588 +0100
3 @@ -242,8 +242,8 @@
4  if test "x$use_parted" = "xyes" ; then
5    USE_PARTED=yes
6    AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
7 -  AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
8 -  AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
9 +  AC_CHECK_LIB(uuid, uuid_generate, [:], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
10 +  AC_CHECK_LIB(dl, dlopen,          [:], AC_MSG_ERROR([*** dl library (libdl) not found]))
11  
12    AC_MSG_CHECKING([for libparted == 1.7.1 or >= 1.8.0])
13    if ! $PKG_CONFIG --atleast-version 1.8.0 libparted; then
14 @@ -417,6 +417,7 @@
15         AC_LANG_POP([C++])
16         if test "$LIB_SMBIOS" = "yes" ; then
17                 AC_MSG_CHECKING([for libsmbios >= 0.13.4])
18 +               save_LIBS="$LIBS"
19                 LIBS="$LIBS -lsmbios"
20                 AC_RUN_IFELSE([AC_LANG_SOURCE([[
21                 #include <smbios/version.h>
22 @@ -436,6 +437,7 @@
23                         return 1;
24                 }]])], [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
25                         [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
26 +               LIBS="$save_LIBS"
27         else
28                 USE_SMBIOS=no
29                 AM_CONDITIONAL(HAVE_SMBIOS, [false])
This page took 0.04973 seconds and 3 git commands to generate.