* qthreads.m4 (QTHREADS_CONFIGURE): On NetBSD, pass through a flag

to the Makefile which explicitly tells it to pass assembly files
through the preprocessor.
* aclocal.m4, configure, Makefile.in: Regenerated.

aclocal.m4

@@ -547,7 +547,10 @@ dnl   macro creates the appropriate symlinks in the qt object directory,
 dnl   and sets the following variables, used in building libqthreads.a:
 dnl      QTHREAD_LTLIBS --- set to libqthreads.la if configuration
 dnl         succeeds, or the empty string if configuration fails.
-dnl      qtmd_h --- the name of the machine-dependent header file.
+dnl      qtmd_h, qtmds_s, qtmdc_c, qtdmdb_s --- the names of the machine-
+dnl         dependent source files.
+dnl      qthread_asflags --- flags to pass to the compiler when processing
+dnl         assembly-language files.
 dnl
 dnl   It also sets the following variables, which describe how clients
 dnl   can link against libqthreads.a:
@@ -577,7 +580,7 @@ dnl   needs to supply the second piece of information as well.
 dnl
 dnl   This whole thing is a little confused about what ought to be
 dnl   done in the top-level configure script, and what ought to be
-dnl   taken care of in the subdirectory.  For example, qtmdc_lo and
+dnl   taken care of in the subdirectory.  For example, qtmds_s and
 dnl   friends really ought not to be even mentioned in the top-level
 dnl   configure script, but here they are.
 
@@ -593,6 +596,7 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
   changequote(,)dnl We use [ and ] in a regexp in the case
 
   THREAD_PACKAGE=QT
+  qthread_asflags=''
   case "$host" in
     i[3456]86-*-*)
       port_name=i386
@@ -600,6 +604,17 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
       qtmds_s=md/i386.s
       qtmdc_c=md/null.c 
       qtdmdb_s=
+      case "$host" in
+        *-*-netbsd* )
+          ## NetBSD needs to be told to pass the assembly code through
+          ## the C preprocessor.  Other GCC installations seem to do
+          ## this by default, but NetBSD's doesn't.  We could get the
+          ## same effect by giving the file a name ending with .S
+          ## instead of .s, but I don't see how to tell automake to do
+          ## that.
+          qthread_asflags='-x assembler-with-cpp'
+        ;;
+      esac
       ;;
     mips-sgi-irix[56]*)
       port_name=irix
@@ -659,6 +674,7 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
   AC_SUBST(qtmds_s)
   AC_SUBST(qtmdc_c)
   AC_SUBST(qtdmdb_s)
+  AC_SUBST(qthread_asflags)
   AC_SUBST(THREAD_PACKAGE)
   AC_SUBST(THREAD_CPPFLAGS)
   AC_SUBST(THREAD_LIBS_LOCAL)

configure

@@ -4505,6 +4505,7 @@ echo "configure:4501: checking QuickThreads configuration" >&5
 
   
   THREAD_PACKAGE=QT
+  qthread_asflags=''
   case "$host" in
     i[3456]86-*-*)
       port_name=i386
@@ -4512,6 +4513,17 @@ echo "configure:4501: checking QuickThreads configuration" >&5
       qtmds_s=md/i386.s
       qtmdc_c=md/null.c 
       qtdmdb_s=
+      case "$host" in
+        *-*-netbsd* )
+          ## NetBSD needs to be told to pass the assembly code through
+          ## the C preprocessor.  Other GCC installations seem to do
+          ## this by default, but NetBSD's doesn't.  We could get the
+          ## same effect by giving the file a name ending with .S
+          ## instead of .s, but I don't see how to tell automake to do
+          ## that.
+          qthread_asflags='-x assembler-with-cpp'
+        ;;
+      esac
       ;;
     mips-sgi-irix[56]*)
       port_name=irix
@@ -4575,6 +4587,7 @@ echo "configure:4501: checking QuickThreads configuration" >&5
   
   
   
+  
 
    ;;
 esac
@@ -4628,7 +4641,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4632: checking for $ac_word" >&5
+echo "configure:4645: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4837,6 +4850,7 @@ s%@qtmd_h@%$qtmd_h%g
 s%@qtmds_s@%$qtmds_s%g
 s%@qtmdc_c@%$qtmdc_c%g
 s%@qtdmdb_s@%$qtdmdb_s%g
+s%@qthread_asflags@%$qthread_asflags%g
 s%@THREAD_PACKAGE@%$THREAD_PACKAGE%g
 s%@THREAD_CPPFLAGS@%$THREAD_CPPFLAGS%g
 s%@THREAD_LIBS_LOCAL@%$THREAD_LIBS_LOCAL%g

qthreads.m4

@@ -6,7 +6,10 @@ dnl   macro creates the appropriate symlinks in the qt object directory,
 dnl   and sets the following variables, used in building libqthreads.a:
 dnl      QTHREAD_LTLIBS --- set to libqthreads.la if configuration
 dnl         succeeds, or the empty string if configuration fails.
-dnl      qtmd_h --- the name of the machine-dependent header file.
+dnl      qtmd_h, qtmds_s, qtmdc_c, qtdmdb_s --- the names of the machine-
+dnl         dependent source files.
+dnl      qthread_asflags --- flags to pass to the compiler when processing
+dnl         assembly-language files.
 dnl
 dnl   It also sets the following variables, which describe how clients
 dnl   can link against libqthreads.a:
@@ -36,7 +39,7 @@ dnl   needs to supply the second piece of information as well.
 dnl
 dnl   This whole thing is a little confused about what ought to be
 dnl   done in the top-level configure script, and what ought to be
-dnl   taken care of in the subdirectory.  For example, qtmdc_lo and
+dnl   taken care of in the subdirectory.  For example, qtmds_s and
 dnl   friends really ought not to be even mentioned in the top-level
 dnl   configure script, but here they are.
 
@@ -52,6 +55,7 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
   changequote(,)dnl We use [ and ] in a regexp in the case
 
   THREAD_PACKAGE=QT
+  qthread_asflags=''
   case "$host" in
     i[3456]86-*-*)
       port_name=i386
@@ -59,6 +63,17 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
       qtmds_s=md/i386.s
       qtmdc_c=md/null.c 
       qtdmdb_s=
+      case "$host" in
+        *-*-netbsd* )
+          ## NetBSD needs to be told to pass the assembly code through
+          ## the C preprocessor.  Other GCC installations seem to do
+          ## this by default, but NetBSD's doesn't.  We could get the
+          ## same effect by giving the file a name ending with .S
+          ## instead of .s, but I don't see how to tell automake to do
+          ## that.
+          qthread_asflags='-x assembler-with-cpp'
+        ;;
+      esac
       ;;
     mips-sgi-irix[56]*)
       port_name=irix
@@ -118,6 +133,7 @@ AC_DEFUN([QTHREADS_CONFIGURE],[
   AC_SUBST(qtmds_s)
   AC_SUBST(qtmdc_c)
   AC_SUBST(qtdmdb_s)
+  AC_SUBST(qthread_asflags)
   AC_SUBST(THREAD_PACKAGE)
   AC_SUBST(THREAD_CPPFLAGS)
   AC_SUBST(THREAD_LIBS_LOCAL)