Changeset 4721


Ignore:
Timestamp:
Jan 29, 2014 10:08:28 AM (11 years ago)
Author:
nanang
Message:

Misc (re #1630): Modified configure script to only include libnsl if needed, e.g: on Solaris networking functions are in libnsl (thanks Jeremy Laine for the patch).

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r4701 r4721  
    22252225$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22262226as_fn_error $? "failed to load site script $ac_site_file 
    2227 See \`config.log' for more details" "$LINENO" 5; } 
     2227See \`config.log' for more details" "$LINENO" 5 ; } 
    22282228  fi 
    22292229done 
    … …  
    23682368case $ac_cv_build in 
    23692369*-*-*) ;; 
    2370 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
     2370*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
    23712371esac 
    23722372build=$ac_cv_build 
    … …  
    24012401case $ac_cv_host in 
    24022402*-*-*) ;; 
    2403 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
     2403*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
    24042404esac 
    24052405host=$ac_cv_host 
    … …  
    24342434case $ac_cv_target in 
    24352435*-*-*) ;; 
    2436 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
     2436*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
    24372437esac 
    24382438target=$ac_cv_target 
    … …  
    27712771$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    27722772as_fn_error $? "no acceptable C compiler found in \$PATH 
    2773 See \`config.log' for more details" "$LINENO" 5; } 
     2773See \`config.log' for more details" "$LINENO" 5 ; } 
    27742774 
    27752775# Provide some information about the compiler. 
    … …  
    28862886$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28872887as_fn_error 77 "C compiler cannot create executables 
    2888 See \`config.log' for more details" "$LINENO" 5; } 
     2888See \`config.log' for more details" "$LINENO" 5 ; } 
    28892889else 
    28902890  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29292929$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29302930as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2931 See \`config.log' for more details" "$LINENO" 5; } 
     2931See \`config.log' for more details" "$LINENO" 5 ; } 
    29322932fi 
    29332933rm -f conftest conftest$ac_cv_exeext 
    … …  
    29882988as_fn_error $? "cannot run C compiled programs. 
    29892989If you meant to cross compile, use \`--host'. 
    2990 See \`config.log' for more details" "$LINENO" 5; } 
     2990See \`config.log' for more details" "$LINENO" 5 ; } 
    29912991    fi 
    29922992  fi 
    … …  
    30403040$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30413041as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3042 See \`config.log' for more details" "$LINENO" 5; } 
     3042See \`config.log' for more details" "$LINENO" 5 ; } 
    30433043fi 
    30443044rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    40954095fi 
    40964096 
    4097 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lnsl" >&5 
    4098 $as_echo_n "checking for puts in -lnsl... " >&6; } 
    4099 if ${ac_cv_lib_nsl_puts+:} false; then : 
    4100   $as_echo_n "(cached) " >&6 
    4101 else 
    4102   ac_check_lib_save_LIBS=$LIBS 
    4103 LIBS="-lnsl  $LIBS" 
    4104 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    4105 /* end confdefs.h.  */ 
    4106  
    4107 /* Override any GCC internal prototype to avoid an error. 
    4108    Use char because int might match the return type of a GCC 
    4109    builtin and then its argument prototype would still apply.  */ 
    4110 #ifdef __cplusplus 
    4111 extern "C" 
    4112 #endif 
    4113 char puts (); 
    4114 int 
    4115 main () 
    4116 { 
    4117 return puts (); 
    4118   ; 
    4119   return 0; 
    4120 } 
    4121 _ACEOF 
    4122 if ac_fn_c_try_link "$LINENO"; then : 
    4123   ac_cv_lib_nsl_puts=yes 
    4124 else 
    4125   ac_cv_lib_nsl_puts=no 
    4126 fi 
    4127 rm -f core conftest.err conftest.$ac_objext \ 
    4128     conftest$ac_exeext conftest.$ac_ext 
    4129 LIBS=$ac_check_lib_save_LIBS 
    4130 fi 
    4131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_puts" >&5 
    4132 $as_echo "$ac_cv_lib_nsl_puts" >&6; } 
    4133 if test "x$ac_cv_lib_nsl_puts" = xyes; then : 
    4134   cat >>confdefs.h <<_ACEOF 
    4135 #define HAVE_LIBNSL 1 
    4136 _ACEOF 
    4137  
    4138   LIBS="-lnsl $LIBS" 
    4139  
    4140 fi 
    4141  
    41424097{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 
    41434098$as_echo_n "checking for sin in -lm... " >&6; } 
    … …  
    42684223if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then : 
    42694224  ac_has_uuid_lib=1 
     4225fi 
     4226 
     4227{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 
     4228$as_echo_n "checking for library containing gethostbyname... " >&6; } 
     4229if ${ac_cv_search_gethostbyname+:} false; then : 
     4230  $as_echo_n "(cached) " >&6 
     4231else 
     4232  ac_func_search_save_LIBS=$LIBS 
     4233cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
     4234/* end confdefs.h.  */ 
     4235 
     4236/* Override any GCC internal prototype to avoid an error. 
     4237   Use char because int might match the return type of a GCC 
     4238   builtin and then its argument prototype would still apply.  */ 
     4239#ifdef __cplusplus 
     4240extern "C" 
     4241#endif 
     4242char gethostbyname (); 
     4243int 
     4244main () 
     4245{ 
     4246return gethostbyname (); 
     4247  ; 
     4248  return 0; 
     4249} 
     4250_ACEOF 
     4251for ac_lib in '' nsl; do 
     4252  if test -z "$ac_lib"; then 
     4253    ac_res="none required" 
     4254  else 
     4255    ac_res=-l$ac_lib 
     4256    LIBS="-l$ac_lib  $ac_func_search_save_LIBS" 
     4257  fi 
     4258  if ac_fn_c_try_link "$LINENO"; then : 
     4259  ac_cv_search_gethostbyname=$ac_res 
     4260fi 
     4261rm -f core conftest.err conftest.$ac_objext \ 
     4262    conftest$ac_exeext 
     4263  if ${ac_cv_search_gethostbyname+:} false; then : 
     4264  break 
     4265fi 
     4266done 
     4267if ${ac_cv_search_gethostbyname+:} false; then : 
     4268 
     4269else 
     4270  ac_cv_search_gethostbyname=no 
     4271fi 
     4272rm conftest.$ac_ext 
     4273LIBS=$ac_func_search_save_LIBS 
     4274fi 
     4275{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 
     4276$as_echo "$ac_cv_search_gethostbyname" >&6; } 
     4277ac_res=$ac_cv_search_gethostbyname 
     4278if test "$ac_res" != no; then : 
     4279  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 
     4280 
    42704281fi 
    42714282 
    … …  
    44244435$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44254436as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4426 See \`config.log' for more details" "$LINENO" 5; } 
     4437See \`config.log' for more details" "$LINENO" 5 ; } 
    44274438fi 
    44284439 
    … …  
    49144925   *) 
    49154926     as_fn_error $? "unknown endianness 
    4916  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
     4927 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
    49174928 esac 
    49184929 
    … …  
    70907101$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    70917102as_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 
    7092 See \`config.log' for more details" "$LINENO" 5; } 
     7103See \`config.log' for more details" "$LINENO" 5 ; } 
    70937104fi 
    70947105rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    71467157$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71477158as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7148 See \`config.log' for more details" "$LINENO" 5; } 
     7159See \`config.log' for more details" "$LINENO" 5 ; } 
    71497160            fi 
    71507161        else 
    … …  
    71527163$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71537164as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7154 See \`config.log' for more details" "$LINENO" 5; } 
     7165See \`config.log' for more details" "$LINENO" 5 ; } 
    71557166        fi 
    71567167 
    … …  
    71607171$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71617172as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7162 See \`config.log' for more details" "$LINENO" 5; } 
     7173See \`config.log' for more details" "$LINENO" 5 ; } 
    71637174            exit 1; 
    71647175        fi 
    … …  
    71747185$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71757186as_fn_error $? "bug in this script: unsupported IPP version 
    7176 See \`config.log' for more details" "$LINENO" 5; } 
     7187See \`config.log' for more details" "$LINENO" 5 ; } 
    71777188        fi 
    71787189 
    … …  
    71817192$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71827193as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7183 See \`config.log' for more details" "$LINENO" 5; } 
     7194See \`config.log' for more details" "$LINENO" 5 ; } 
    71847195        fi 
    71857196 
    … …  
    72177228$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72187229as_fn_error $? "failed 
    7219 See \`config.log' for more details" "$LINENO" 5; } 
     7230See \`config.log' for more details" "$LINENO" 5 ; } 
    72207231fi 
    72217232rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    75157526 
    75167527                ac_fn_c_check_header_mongrel "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default" 
    7517 if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = x""yes; then : 
     7528if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes; then : 
    75187529  opencore_amrwb_enc_h_present=1 
    75197530fi 
    … …  
    75217532 
    75227533                ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default" 
    7523 if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = x""yes; then : 
     7534if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes; then : 
    75247535  opencore_amrwb_dec_h_present=1 
    75257536fi 
    … …  
    75287539                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5 
    75297540$as_echo_n "checking for D_IF_init in -lopencore-amrwb... " >&6; } 
    7530 if test "${ac_cv_lib_opencore_amrwb_D_IF_init+set}" = set; then : 
     7541if ${ac_cv_lib_opencore_amrwb_D_IF_init+:} false; then : 
    75317542  $as_echo_n "(cached) " >&6 
    75327543else 
    … …  
    75627573{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5 
    75637574$as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; } 
    7564 if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = x""yes; then : 
     7575if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then : 
    75657576  opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb" 
    75667577fi 
    … …  
    75687579                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5 
    75697580$as_echo_n "checking for E_IF_init in -lvo-amrwbenc... " >&6; } 
    7570 if test "${ac_cv_lib_vo_amrwbenc_E_IF_init+set}" = set; then : 
     7581if ${ac_cv_lib_vo_amrwbenc_E_IF_init+:} false; then : 
    75717582  $as_echo_n "(cached) " >&6 
    75727583else 
    … …  
    76027613{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vo_amrwbenc_E_IF_init" >&5 
    76037614$as_echo "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; } 
    7604 if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = x""yes; then : 
     7615if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes; then : 
    76057616  opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc" 
    76067617fi 
    … …  
    76617672 
    76627673                ac_fn_c_check_header_mongrel "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default" 
    7663 if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = x""yes; then : 
     7674if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes; then : 
    76647675  silk_h_present=1 
    76657676fi 
    … …  
    76687679                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5 
    76697680$as_echo_n "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; } 
    7670 if test "${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+set}" = set; then : 
     7681if ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+:} false; then : 
    76717682  $as_echo_n "(cached) " >&6 
    76727683else 
    … …  
    77027713{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&5 
    77037714$as_echo "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; } 
    7704 if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = x""yes; then : 
     7715if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes; then : 
    77057716  silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK" 
    77067717fi 
    … …  
    85298540    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    85308541 
    8531   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
     8542  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
    85328543  esac 
    85338544done 
    … …  
    88468857  case $ac_mode$ac_tag in 
    88478858  :[FHL]*:*);; 
    8848   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
     8859  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
    88498860  :[FH]-) ac_tag=-:-;; 
    88508861  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    88748885           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    88758886           esac || 
    8876            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
     8887           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
    88778888      esac 
    88788889      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    89018912    case $ac_tag in 
    89028913    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    8903       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
     8914      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
    89048915    esac 
    89058916    ;; 

  • pjproject/trunk/aconfigure.ac

    r4701 r4721  
    114114AC_CHECK_LIB(socket,puts) 
    115115AC_CHECK_LIB(rt,puts) 
    116 AC_CHECK_LIB(nsl,puts) 
    117116AC_CHECK_LIB(m,sin) 
    118117AC_CHECK_LIB(uuid,uuid_generate) 
    119118AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1]) 
     119AC_SEARCH_LIBS(gethostbyname,nsl) 
    120120 
    121121AC_MSG_RESULT([Setting PJ_M_NAME to $target_cpu]) 
Note: See TracChangeset for help on using the changeset viewer.