Attachment #584284 for bug #690486




	fi
}

check_sys_queue()
{
    cat >$TMPDIR/queue_test.c <<EOF
#include <sys/queue.h>
struct nest_qentry {
	int attr_type;
	TAILQ_ENTRY(nest_qentry) nest_entries;
};
int main(int argc, char **argv) {
	return 0;
}
EOF
    if $CC -I$INCLUDE -o $TMPDIR/queue_test $TMPDIR/queue_test.c >/dev/null 2>&1; then
	echo "no"
    else
	if ${PKG_CONFIG} libbsd --exists; then
		echo 'CFLAGS += -DHAVE_LIBBSD_SYS_QUEUE' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
		echo "no"
	else
		echo 'CFLAGS += -DNEED_SYS_QUEUE' >>$CONFIG
		echo "yes"
	fi
    fi
    rm -f $TMPDIR/queue_test.c $TMPDIR/queue_test
}

quiet_config()
{
	cat <<EOF

echo -n "libcap support: "
check_cap

echo -n "need for sys/queue.h API: "
check_sys_queue

echo >> $CONFIG
echo "%.o: %.c" >> $CONFIG
echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG

Lines 25-31 Link Here

(-)a/devlink/devlink.c (-2 / +8 lines)
25	#include <linux/devlink.h>	25	#include <linux/devlink.h>
26	#include <libmnl/libmnl.h>	26	#include <libmnl/libmnl.h>
27	#include <netinet/ether.h>	27	#include <netinet/ether.h>
28	#include <sys/queue.h>	28	#ifdef HAVE_LIBBSD_SYS_QUEUE
		29	# include <bsd/sys/queue.h>
		30	#else
		31	# include <sys/queue.h>
		32	#endif
		33	#ifdef NEED_SYS_QUEUE
		34	# error "No <sys/queue.h> implementation found."
		35	#endif
29		36
30	#include "SNAPSHOT.h"	37	#include "SNAPSHOT.h"
31	#include "list.h"	38	#include "list.h"
32	-

Return to bug 690486

Lines 323-328 check_cap() Link Here

(-)a/configure (+30 lines)
323	fi	323	fi
324	}	324	}
325		325
		326	check_sys_queue()
		327	{
		328	cat >$TMPDIR/queue_test.c <<EOF
		329	#include <sys/queue.h>
		330	struct nest_qentry {
		331	int attr_type;
		332	TAILQ_ENTRY(nest_qentry) nest_entries;
		333	};
		334	int main(int argc, char **argv) {
		335	return 0;
		336	}
		337	EOF
		338	if $CC -I$INCLUDE -o $TMPDIR/queue_test $TMPDIR/queue_test.c >/dev/null 2>&1; then
		339	echo "no"
		340	else
		341	if ${PKG_CONFIG} libbsd --exists; then
		342	echo 'CFLAGS += -DHAVE_LIBBSD_SYS_QUEUE' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
		343	echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
		344	echo "no"
		345	else
		346	echo 'CFLAGS += -DNEED_SYS_QUEUE' >>$CONFIG
		347	echo "yes"
		348	fi
		349	fi
		350	rm -f $TMPDIR/queue_test.c $TMPDIR/queue_test
		351	}
		352
326	quiet_config()	353	quiet_config()
327	{	354	{
328	cat <<EOF	355	cat <<EOF
Lines 398-403 check_strlcpy Link Here
398	echo -n "libcap support: "	425	echo -n "libcap support: "
399	check_cap	426	check_cap
400		427
		428	echo -n "need for sys/queue.h API: "
		429	check_sys_queue
		430
401	echo >> $CONFIG	431	echo >> $CONFIG
402	echo "%.o: %.c" >> $CONFIG	432	echo "%.o: %.c" >> $CONFIG
403	echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG	433	echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG