Attachment #421540 for bug #477758

Lines 19-25 m4_include([m4/ltversion.m4]) Link Here

(-)xfsprogs-4.3.0.orig/aclocal.m4 (-1 lines)
19	m4_include([m4/lt~obsolete.m4])	19	m4_include([m4/lt~obsolete.m4])
20	m4_include([m4/manual_format.m4])	20	m4_include([m4/manual_format.m4])
21	m4_include([m4/multilib.m4])	21	m4_include([m4/multilib.m4])
22	m4_include([m4/package_aiodev.m4])
23	m4_include([m4/package_blkid.m4])	22	m4_include([m4/package_blkid.m4])
24	m4_include([m4/package_globals.m4])	23	m4_include([m4/package_globals.m4])
25	m4_include([m4/package_libcdev.m4])	24	m4_include([m4/package_libcdev.m4])

Lines 56-61 AC_ARG_ENABLE(lib64, Link Here

(-)xfsprogs-4.3.0.orig/configure.ac (-3 / +3 lines)
56	enable_lib64=yes)	56	enable_lib64=yes)
57	AC_SUBST(enable_lib64)	57	AC_SUBST(enable_lib64)
58		58
		59	librt="-lrt"
		60	AC_SUBST(librt)
		61
59	#	62	#
60	# If the user specified a libdir ending in lib64 do not append another	63	# If the user specified a libdir ending in lib64 do not append another
61	# 64 to the library names.	64	# 64 to the library names.
Lines 101-109 AC_PACKAGE_GLOBALS(xfsprogs) Link Here
101	AC_PACKAGE_UTILITIES(xfsprogs)	104	AC_PACKAGE_UTILITIES(xfsprogs)
102	AC_MULTILIB($enable_lib64)	105	AC_MULTILIB($enable_lib64)
103		106
104	AC_PACKAGE_NEED_AIO_H
105	AC_PACKAGE_NEED_LIO_LISTIO
106
107	AC_PACKAGE_NEED_UUID_H	107	AC_PACKAGE_NEED_UUID_H
108	AC_PACKAGE_NEED_UUIDCOMPARE	108	AC_PACKAGE_NEED_UUIDCOMPARE
109		109

Lines 14-20 CONFIGURE = \ Link Here

(-)xfsprogs-4.3.0.orig/m4/Makefile (-1 lines)
14		14
15	LSRCFILES = \	15	LSRCFILES = \
16	manual_format.m4 \	16	manual_format.m4 \
17	package_aiodev.m4 \
18	package_blkid.m4 \	17	package_blkid.m4 \
19	package_globals.m4 \	18	package_globals.m4 \
20	package_libcdev.m4 \	19	package_libcdev.m4 \




#
# Check if we have a libaio.h installed
#
AC_DEFUN([AC_PACKAGE_WANT_AIO],
  [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
    AC_SUBST(have_aio)
  ])

#
# Check if we have an aio.h installed
#
AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
  [ AC_CHECK_HEADERS(aio.h)
    if test $ac_cv_header_aio_h = no; then
	echo
	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
	exit 1
    fi
  ])

#
# Check if we have the lio_listio routine in either libc/librt
#
AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
  [ AC_CHECK_FUNCS(lio_listio)
    if test $ac_cv_func_lio_listio = yes; then
	librt=""
    else
	AC_CHECK_LIB(rt, lio_listio,, [
	    echo
	    echo 'FATAL ERROR: could not find a library with lio_listio.'
	    exit 1],[-lpthread])
	librt="-lrt"
    fi
    AC_SUBST(librt)
  ])


Return to bug 477758

Lines 1-37 Link Here

(-)xfsprogs-4.3.0.orig/m4/package_aiodev.m4 (-36 lines)
1	#
2	# Check if we have a libaio.h installed
3	#
4	AC_DEFUN([AC_PACKAGE_WANT_AIO],
5	[ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
6	AC_SUBST(have_aio)
7	])
8
9	#
10	# Check if we have an aio.h installed
11	#
12	AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
13	[ AC_CHECK_HEADERS(aio.h)
14	if test $ac_cv_header_aio_h = no; then
15	echo
16	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
17	exit 1
18	fi
19	])
20
21	#
22	# Check if we have the lio_listio routine in either libc/librt
23	#
24	AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
25	[ AC_CHECK_FUNCS(lio_listio)
26	if test $ac_cv_func_lio_listio = yes; then
27	librt=""
28	else
29	AC_CHECK_LIB(rt, lio_listio,, [
30	echo
31	echo 'FATAL ERROR: could not find a library with lio_listio.'
32	exit 1],[-lpthread])
33	librt="-lrt"
34	fi
35	AC_SUBST(librt)
36	])
37		1