Changeset 5270 for pjproject


Ignore:
Timestamp:
Mar 23, 2016 11:57:41 AM (9 years ago)
Author:
nanang
Message:

Re #1609: Minor fix in configure scripts in ALSA detection message.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r5269 r5270  
    22742274$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22752275as_fn_error $? "failed to load site script $ac_site_file 
    2276 See \`config.log' for more details" "$LINENO" 5 ; } 
     2276See \`config.log' for more details" "$LINENO" 5; } 
    22772277  fi 
    22782278done 
    … …  
    24172417case $ac_cv_build in 
    24182418*-*-*) ;; 
    2419 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
     2419*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
    24202420esac 
    24212421build=$ac_cv_build 
    … …  
    24502450case $ac_cv_host in 
    24512451*-*-*) ;; 
    2452 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
     2452*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
    24532453esac 
    24542454host=$ac_cv_host 
    … …  
    24832483case $ac_cv_target in 
    24842484*-*-*) ;; 
    2485 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
     2485*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
    24862486esac 
    24872487target=$ac_cv_target 
    … …  
    28202820$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28212821as_fn_error $? "no acceptable C compiler found in \$PATH 
    2822 See \`config.log' for more details" "$LINENO" 5 ; } 
     2822See \`config.log' for more details" "$LINENO" 5; } 
    28232823 
    28242824# Provide some information about the compiler. 
    … …  
    29352935$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29362936as_fn_error 77 "C compiler cannot create executables 
    2937 See \`config.log' for more details" "$LINENO" 5 ; } 
     2937See \`config.log' for more details" "$LINENO" 5; } 
    29382938else 
    29392939  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29782978$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29792979as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2980 See \`config.log' for more details" "$LINENO" 5 ; } 
     2980See \`config.log' for more details" "$LINENO" 5; } 
    29812981fi 
    29822982rm -f conftest conftest$ac_cv_exeext 
    … …  
    30373037as_fn_error $? "cannot run C compiled programs. 
    30383038If you meant to cross compile, use \`--host'. 
    3039 See \`config.log' for more details" "$LINENO" 5 ; } 
     3039See \`config.log' for more details" "$LINENO" 5; } 
    30403040    fi 
    30413041  fi 
    … …  
    30893089$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30903090as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3091 See \`config.log' for more details" "$LINENO" 5 ; } 
     3091See \`config.log' for more details" "$LINENO" 5; } 
    30923092fi 
    30933093rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    44834483$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44844484as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4485 See \`config.log' for more details" "$LINENO" 5 ; } 
     4485See \`config.log' for more details" "$LINENO" 5; } 
    44864486fi 
    44874487 
    … …  
    49734973   *) 
    49744974     as_fn_error $? "unknown endianness 
    4975  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
     4975 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
    49764976 esac 
    49774977 
    … …  
    61256125        ;; 
    61266126  *) 
    6127                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ALSA dev lib is installed" >&5 
    6128 $as_echo_n "checking if ALSA dev lib is installed... " >&6; } 
    6129         ac_pjmedia_snd=alsa 
     6127                ac_pjmedia_snd=alsa 
    61306128        ac_pa_use_alsa=1 
    61316129 
    61326130        ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" 
    61336131if test "x$ac_cv_header_alsa_version_h" = xyes; then : 
    6134  
    6135                          LIBS="$LIBS -lasound" 
    6136                          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    6137 $as_echo "yes" >&6; } 
    6138  
    6139 else 
    6140  
    6141                          ac_pa_use_alsa=0 
    6142                          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
    6143 $as_echo "no" >&6; } 
    6144  
     6132  LIBS="$LIBS -lasound" 
     6133else 
     6134  ac_pa_use_alsa=0 
    61456135fi 
    61466136 
    … …  
    76247614$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76257615as_fn_error $? "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info 
    7626 See \`config.log' for more details" "$LINENO" 5 ; } 
     7616See \`config.log' for more details" "$LINENO" 5; } 
    76277617fi 
    76287618rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    76807670$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76817671as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7682 See \`config.log' for more details" "$LINENO" 5 ; } 
     7672See \`config.log' for more details" "$LINENO" 5; } 
    76837673            fi 
    76847674        else 
    … …  
    76867676$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76877677as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7688 See \`config.log' for more details" "$LINENO" 5 ; } 
     7678See \`config.log' for more details" "$LINENO" 5; } 
    76897679        fi 
    76907680 
    … …  
    76947684$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76957685as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7696 See \`config.log' for more details" "$LINENO" 5 ; } 
     7686See \`config.log' for more details" "$LINENO" 5; } 
    76977687            exit 1; 
    76987688        fi 
    … …  
    77087698$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77097699as_fn_error $? "bug in this script: unsupported IPP version 
    7710 See \`config.log' for more details" "$LINENO" 5 ; } 
     7700See \`config.log' for more details" "$LINENO" 5; } 
    77117701        fi 
    77127702 
    … …  
    77157705$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77167706as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7717 See \`config.log' for more details" "$LINENO" 5 ; } 
     7707See \`config.log' for more details" "$LINENO" 5; } 
    77187708        fi 
    77197709 
    … …  
    77517741$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77527742as_fn_error $? "no 
    7753 See \`config.log' for more details" "$LINENO" 5 ; } 
     7743See \`config.log' for more details" "$LINENO" 5; } 
    77547744fi 
    77557745rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    91499139    "third_party/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;; 
    91509140 
    9151   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
     9141  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
    91529142  esac 
    91539143done 
    … …  
    94669456  case $ac_mode$ac_tag in 
    94679457  :[FHL]*:*);; 
    9468   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
     9458  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
    94699459  :[FH]-) ac_tag=-:-;; 
    94709460  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    94949484           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    94959485           esac || 
    9496            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
     9486           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
    94979487      esac 
    94989488      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    95219511    case $ac_tag in 
    95229512    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    9523       || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
     9513      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
    95249514    esac 
    95259515    ;; 

  • pjproject/trunk/aconfigure.ac

    r5269 r5270  
    662662  *) 
    663663        dnl # Check if ALSA is available 
    664         AC_MSG_CHECKING([if ALSA dev lib is installed]) 
    665664        ac_pjmedia_snd=alsa 
    666665        AC_SUBST(ac_pa_use_alsa,1) 
    667666        AC_CHECK_HEADER(alsa/version.h, 
    668                         [ 
    669                          LIBS="$LIBS -lasound" 
    670                          AC_MSG_RESULT(yes) 
    671                         ], 
    672                         [ 
    673                          ac_pa_use_alsa=0 
    674                          AC_MSG_RESULT(no) 
    675                         ]) 
     667                        [LIBS="$LIBS -lasound"], 
     668                        [ac_pa_use_alsa=0]) 
    676669        AC_MSG_RESULT([Checking sound device backend... unix]) 
    677670 
Note: See TracChangeset for help on using the changeset viewer.