Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fixed a bug. Added linkage flags for darwin. Changed awk references to $AWK so 

gawk will be used if present.

svn path=/trunk/boinc/; revision=6084
This commit is contained in:
Eric J. Korpela 2005-05-09 23:48:30 +00:00
parent 3aa917defe
commit f9dba71f16
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
m4/sah_check_lib.m4
View File

@ -18,6 +18,7 @@ AC_DEFUN([SAH_CHECK_LIB],[
if test "${lib_is_static}" = "no" ; then if test "${lib_is_static}" = "no" ; then
SAH_DYNAMIC_LIB_REQUIRED(${alib},[$2],[ SAH_DYNAMIC_LIB_REQUIRED(${alib},[$2],[
sah_lib_last="${sah_dynamic_lib_last}" sah_lib_last="${sah_dynamic_lib_last}"
$3
],[$4]) ],[$4])
fi fi
]) ])
@ -65,7 +66,7 @@ AC_DEFUN([SAH_LINKAGE_FLAGS],[
ld_dynamic_option="" ld_dynamic_option=""
LD_EXPORT_DYNAMIC="" LD_EXPORT_DYNAMIC=""
else else
if test -z "${ld_static_option}" if test -z "${ld_static_option}"
then then
case $target in case $target in
*linux* | *solaris* | *cygwin* ) *linux* | *solaris* | *cygwin* )
@ -76,6 +77,14 @@ AC_DEFUN([SAH_LINKAGE_FLAGS],[
ld_dynamic_option="-Wl,-Bdynamic" ld_dynamic_option="-Wl,-Bdynamic"
AC_MSG_RESULT($ld_dynamic_option) AC_MSG_RESULT($ld_dynamic_option)
;; ;;
*darwin* )
AC_MSG_CHECKING([${CC} flags for static linkage ...])
ld_static_option="-static"
AC_MSG_RESULT($ld_static_option)
AC_MSG_CHECKING([${CC} flags for dynamic linkage ...])
ld_dynamic_option="-dynamic"
AC_MSG_RESULT($ld_dynamic_option)
;;
*) *)
if test -z "${dummy_ld_variable_gfdsahjf}" if test -z "${dummy_ld_variable_gfdsahjf}"
then then
@ -338,7 +347,7 @@ then
tmp_libpath="${tmp_libpath}:${PATH}" tmp_libpath="${tmp_libpath}:${PATH}"
fi fi
gcc_version=`${CC} -v 2>&1 | grep "gcc version" | awk '{print $[]3}'` gcc_version=`${CC} -v 2>&1 | grep "gcc version" | $AWK '{print $[]3}'`
for gcc_host in `${CC} -v 2>&1 | grep host` --host=${ac_cv_target} for gcc_host in `${CC} -v 2>&1 | grep host` --host=${ac_cv_target}
do do
@ -354,7 +363,7 @@ do
if test -n "`echo x$dirs | grep x--prefix=`" if test -n "`echo x$dirs | grep x--prefix=`"
then then
gcc_prefix="`echo $dirs | sed 's/--prefix=//'`" gcc_prefix="`echo $dirs | sed 's/--prefix=//'`"
gcc_specs=`${CC} -v 2>&1 | grep specs | awk '{print $[]4}' | sed 's/\/specs//'` gcc_specs=`${CC} -v 2>&1 | grep specs | $AWK '{print $[]4}' | sed 's/\/specs//'`
tmp_libpath="${gcc_specs}:${gcc_prefix}/lib:${gcc_prefix}/lib/gcc-lib/${gcc_host}/${gcc_version}:${tmp_libpath}" tmp_libpath="${gcc_specs}:${gcc_prefix}/lib:${gcc_prefix}/lib/gcc-lib/${gcc_host}/${gcc_version}:${tmp_libpath}"
break break
fi fi
@ -433,7 +442,7 @@ else
fi fi
fi fi
tmp_dir_list=`echo ${tmp_libpath}:/lib:/usr/lib:/usr/ucb/lib:/usr/local/lib:/opt/misc/lib:${tmp_dir_list} | awk -F: '{for (i=1;i<(NF+1);i++) { print $[]i; }}'` tmp_dir_list=`echo ${tmp_libpath}:/lib:/usr/lib:/usr/ucb/lib:/usr/local/lib:/opt/misc/lib:${tmp_dir_list} | $AWK -F: '{for (i=1;i<(NF+1);i++) { print $[]i; }}'`
tmp_lib_name= tmp_lib_name=
# now that we know where we are looking, find our library # now that we know where we are looking, find our library