Ticket #34672: patch-configure_2.diff

work/octave-3.4.3/configure

@@ -34979 +34979 @@
 
   ## fltk (www.fltk.org)
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fltk..." >&5
+$as_echo_n "checking for fltk... " >&6; }
+
+# Check whether FLTK_CONFIG is set and equal to "no"
+use_fltk="auto detect"
+if test "${FLTK_CONFIG+set}" = set ; then
+    if test "${FLTK_CONFIG}" = "no" ; then
+        use_fltk="disabled"
+    fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${use_fltk}" >&5
+$as_echo "${use_fltk}" >&6; }
+
+if test "${use_fltk}" != "disabled"; then
 
 # Check whether --with-fltk-prefix was given.
 if test "${with_fltk_prefix+set}" = set; then :
@@ -35055 +35070 @@
 $as_echo "no" >&6; }
 fi
 
+fi
 
 
   warn_fltk_config=""
@@ -35072 +35088 @@
       ;;
     esac
 
+    case "$CXX" in
+      *gcc-mp-4.6*)
+      FLTK_LDFLAGS="`echo $FLTK_LDFLAGS | sed -e 's/-arch [^ ]* / /g'`"
+        ;;
+    esac
+        
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support in FLTK" >&5
 $as_echo_n "checking for OpenGL support in FLTK... " >&6; }
     save_CFLAGS="$CFLAGS"