$NetBSD: patch-ad,v 1.3 2005/12/11 22:22:37 joerg Exp $ --- configure.orig 2003-11-28 20:07:16.000000000 +0000 +++ configure @@ -1591,7 +1591,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional fi fi -for ac_func in strdup strstr +for ac_func in strdup strstr getopt_long_only do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:1598: checking for $ac_func" >&5 @@ -1665,7 +1665,14 @@ if test "`uname -s`" = "FreeBSD" ; then cat >> confdefs.h <<\EOF #define AUDIO_NONBLOCKING 1 EOF +fi +if test "`uname -s`" = "DragonFly" ; then + echo "DragonFly detected." + DRAGONFLY=1 + cat >> confdefs.h <<\EOF +#define AUDIO_NONBLOCKING 1 +EOF fi #For NetBSD, look in /usr/pkg/(lib,include) first. Otherwise, the wrong @@ -1987,7 +1994,7 @@ fi if test "$INCLUDEPTHREAD" = 1 ; then - if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then + if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then LDFLAGS="$LDFLAGS -pthread" else echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 @@ -2542,7 +2549,7 @@ else fi done -for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h getopt.h +for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -3862,7 +3869,7 @@ EOF if test "$INCLUDEPTHREAD" = 1 ; then - if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then + if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then LDFLAGS="$LDFLAGS -pthread" cat >> confdefs.h <<\EOF #define _THREAD_SAFE 1 @@ -3907,13 +3914,15 @@ fi -LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer" +LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer -L../getopt" LIBMPEGSOUND="-lmpegsound" LIBNMIXER="-lnmixer" +LIBGETOPT="-lgetopt" + -SRCDIRS="mpegsound nmixer src doc doc/charmap" +SRCDIRS="getopt mpegsound nmixer src doc doc/charmap" trap '' 1 2 15 cat > confcache <<\EOF @@ -4016,7 +4025,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then