Attachment #1100 for bug #942

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 942
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/libk3bdevice/Makefile.am (-1 / +1 lines)
1	AM_CPPFLAGS= -I$(srcdir)/libk3bdevice -I$(srcdir) $(all_includes) $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)	1	AM_CPPFLAGS= -I$(srcdir)/libk3bdevice -I$(srcdir) $(all_includes) $(HAL_INCS) $(DBUSQT_CFLAGS)
2		2
3	KDE_CXXFLAGS = $(ENABLE_PERMISSIVE_FLAG)	3	KDE_CXXFLAGS = $(ENABLE_PERMISSIVE_FLAG)
4		4




  AC_SUBST(HAL_LIBS)


########### Check for DBus

  AC_MSG_CHECKING(for DBus)

  dbus_inc=NOTFOUND
  dbus_lib=NOTFOUND
  dbus=NOTFOUND

  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /usr/include/*/dbus-1.0"
  AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)

  search_incs_arch_deps="$kde_includes /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include /usr/lib/*/dbus-1.0/include"
  AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)

  if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
    dbus_inc=FOUND
  fi

  search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/*/ /usr/lib/*/"
  AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)

  if test -r $dbus_libdir/libdbus-1.so ; then
    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
    dbus_lib=FOUND
  fi

  if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then
    AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps  libraries $dbus_libdir)
    dbus=FOUND
  else
    AC_MSG_RESULT(searched but not found)
  fi

  AC_SUBST(DBUS_INCS)
  AC_SUBST(DBUS_LIBS)

########### Check for DBus-TQt bindings

  AC_MSG_CHECKING(for DBus with DBus-TQt bindings)

  dbusqt_inc=NOTFOUND
  dbusqt_lib=NOTFOUND
  dbusqt=NOTFOUND

  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)

  DBUS_REQ=1.0.0
  PKG_CHECK_MODULES(DBUSQT, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
                    dbus=FOUND,dbus=no)
  fi

  AC_SUBST(DBUSQT_CFLAGS)
  AC_SUBST(DBUSQT_LIBS)

  if test -r $dbusqt_libdir/libdbus-tqt-1.so ; then
    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-tqt-1"
    dbusqt_lib=FOUND
  fi

########### Check if media HAL backend sould be compiled
    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
    dbusqt=FOUND
  else
    AC_MSG_RESULT(searched but not found)
  fi

  AC_SUBST(DBUSQT_INCS)
  AC_SUBST(DBUSQT_LIBS)
fi

########### Check if media HAL backend sould be compiled

have_hal=no
HAL_DBUS_LIBS=""
AC_MSG_RESULT(Found HAL storage version $hal_storage_version)
if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
  AC_DEFINE(HAVE_HAL, , [compile in HAL support])
  have_hal=yes
  HAL_DBUS_LIBS="$HAL_LIBS $DBUSQT_LIBS"
fi

AM_CONDITIONAL(include_HAL, [test x$have_hal = xyes])

Return to bug 942

Lines 120-206 if test "x$ac_cv_use_hal" = "xyes" ; then Link Here

(-)a/libk3bdevice/configure.in.in (-67 / +9 lines)
120	AC_SUBST(HAL_LIBS)	120	AC_SUBST(HAL_LIBS)
121		121
122		122
123	########### Check for DBus
124
125	AC_MSG_CHECKING(for DBus)
126
127	dbus_inc=NOTFOUND
128	dbus_lib=NOTFOUND
129	dbus=NOTFOUND
130
131	search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /usr/include/*/dbus-1.0"
132	AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
133
134	search_incs_arch_deps="$kde_includes /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include /usr/lib/*/dbus-1.0/include"
135	AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
136
137	if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
138	DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
139	dbus_inc=FOUND
140	fi
141
142	search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib// /usr/lib//"
143	AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
144
145	if test -r $dbus_libdir/libdbus-1.so ; then
146	DBUS_LIBS="-L$dbus_libdir -ldbus-1"
147	dbus_lib=FOUND
148	fi
149
150	if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then
151	AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps libraries $dbus_libdir)
152	dbus=FOUND
153	else
154	AC_MSG_RESULT(searched but not found)
155	fi
156
157	AC_SUBST(DBUS_INCS)
158	AC_SUBST(DBUS_LIBS)
159
160	########### Check for DBus-TQt bindings	123	########### Check for DBus-TQt bindings
161		124
162	AC_MSG_CHECKING(for DBus-TQt bindings)	125	AC_MSG_CHECKING(for DBus with DBus-TQt bindings)
163
164	dbusqt_inc=NOTFOUND
165	dbusqt_lib=NOTFOUND
166	dbusqt=NOTFOUND
167
168	search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
169	AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
170		126
171	if test -r $dbusqt_incdir/dbus/connection.h ; then	127	DBUS_REQ=1.0.0
172	DBUSQT_INCS="-I$dbusqt_incdir"	128	PKG_CHECK_MODULES(DBUSQT, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
173	dbusqt_inc=FOUND	129	dbus=FOUND,dbus=no)
174	fi
175		130
176	search_libs="$kde_libraries /usr/lib /usr/lib64 /usr/local/lib"	131	AC_SUBST(DBUSQT_CFLAGS)
177	AC_FIND_FILE(libdbus-tqt-1.so, $search_libs, dbusqt_libdir)	132	AC_SUBST(DBUSQT_LIBS)
178		133
179	if test -r $dbusqt_libdir/libdbus-tqt-1.so ; then
180	DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-tqt-1"
181	dbusqt_lib=FOUND
182	fi
183		134
184	if [test $dbusqt_inc = FOUND] && [test $dbusqt_lib = FOUND] ; then	135	########### Check if media HAL backend sould be compiled
185	AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
186	dbusqt=FOUND
187	else
188	AC_MSG_RESULT(searched but not found)
189	fi
190		136
191	AC_SUBST(DBUSQT_INCS)
192	AC_SUBST(DBUSQT_LIBS)
193	fi	137	fi
194		138
195	########### Check if media HAL backend sould be compiled
196
197	have_hal=no	139	have_hal=no
198	HAL_DBUS_LIBS=""	140	HAL_DBUS_LIBS=""
199	AC_MSG_RESULT(Found HAL storage version $hal_storage_version)	141	AC_MSG_RESULT(Found HAL storage version $hal_storage_version)
200	if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then	142	if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
201	AC_DEFINE(HAVE_HAL, , [compile in HAL support])	143	AC_DEFINE(HAVE_HAL, , [compile in HAL support])
202	have_hal=yes	144	have_hal=yes
203	HAL_DBUS_LIBS="$HAL_LIBS $DBUS_LIBS $DBUSQT_LIBS"	145	HAL_DBUS_LIBS="$HAL_LIBS $DBUSQT_LIBS"
204	fi	146	fi
205		147
206	AM_CONDITIONAL(include_HAL, [test x$have_hal = xyes])	148	AM_CONDITIONAL(include_HAL, [test x$have_hal = xyes])