[libcvd-members] libcvd configure configure.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/08/12 15:21:54

Modified files:
        .              : configure configure.in 

Log message:
        --without-assembler

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.130&r2=1.131

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- configure   4 Aug 2008 23:50:06 -0000       1.129
+++ configure   12 Aug 2008 15:21:53 -0000      1.130
@@ -892,6 +892,7 @@
     --with-mmxext         force presence or absence of MMXEXT (x86 only)
     --with-sse            force presence or absence of SSE  (x86 only)
     --with-sse2           force presence or absence of SSE2  (x86 only)
+    --with-assembler     force presence or absence of asm
   --without-dvbuffer      compile without dvbuffer (libDC1394v1) support 
(Linux only)
   --without-dvbuffer3     compile without dvbuffer3 (libDC1394v{1,2}) support 
(Linux only)
   --without-dc1394v2      do not use libDC1394v2 (use v1 instead) for 
dvbuffer3 (Linux only)
@@ -4250,6 +4251,12 @@
 
 fi;
 
+# Check whether --with-asmembler or --without-asmembler was given.
+if test "${with_asmembler+set}" = set; then
+  withval="$with_asmembler"
+
+fi;
+
 case "$host" in
        *86*)
                have_x86=yes
@@ -5194,19 +5201,55 @@
 
 fi
 
-echo "$as_me:$LINENO: checking assembler supports .type pseudo-op" >&5
+
+
+       if test "$with_assembler" != no && test "$have_assembler" != yes
+       then
+               if test "$with_assembler" == ""
+               then
+                       with_assembler=yes
+               fi
+
+               save_LIBS="$LIBS"
+               save_CXXFLAGS="$CXXFLAGS"
+               a=
+
+       echo "$as_me:$LINENO: checking assembler supports .type pseudo-op" >&5
 echo $ECHO_N "checking assembler supports .type pseudo-op... $ECHO_C" >&6
-if echo '.globl test
-.type test, @function' | as &> /dev/null; then
-  have_assembler=yes
+       if echo '.globl test
+       .type test, @function' | as &> /dev/null; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+echo "${ECHO_T}no" >&6;a=1
 fi
 
 
+
+               if test x$a == x
+               then
+                       cat >>confdefs.h <<\_ACEOF
+#define CVD_HAVE_ASSEMBLER 1
+_ACEOF
+
+                       have_assembler=yes
+
+                       options="$options assembler"
+
+               else
+                       LIBS="$save_LIBS"
+                       CXXFLAGS="$save_CXXFLAGS"
+               fi
+       fi
+
+       if test "$have_assembler" != yes
+       then
+               :
+
+       fi
+
+
 
################################################################################
 #
 # Operating system specific parts

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- configure.in        4 Aug 2008 23:50:06 -0000       1.130
+++ configure.in        12 Aug 2008 15:21:54 -0000      1.131
@@ -310,6 +310,7 @@
 AC_ARG_WITH(mmxext, [    --with-mmxext         force presence or absence of 
MMXEXT (x86 only) ])       
 AC_ARG_WITH(sse, [    --with-sse            force presence or absence of SSE  
(x86 only)])     
 AC_ARG_WITH(sse2, [    --with-sse2           force presence or absence of SSE2 
 (x86 only)])   
+AC_ARG_WITH(asmembler, [    --with-assembler     force presence or absence of 
asm])    
 
 case "$host" in
        *86*)
@@ -373,11 +374,14 @@
        AC_SUBST(have_32bit,yes)
 fi
 
-AC_MSG_CHECKING([assembler supports .type pseudo-op])
-AS_IF([echo '.globl test
-.type test, @function' | as &> /dev/null], 
-       [AC_SUBST(have_assembler,yes) AC_MSG_RESULT(yes)],
-       [AC_MSG_RESULT(no)])
+
+CHECK_FOR_OPTION(assembler, [
+       AC_MSG_CHECKING([assembler supports .type pseudo-op])
+       AS_IF([echo '.globl test
+       .type test, @function' | as &> /dev/null], 
+               [AC_MSG_RESULT(yes)],
+               [AC_MSG_RESULT(no);a=1])
+])
 
 
################################################################################
 #