Skip to content

Commit

Permalink
Fix build when building on OSX, using non standard libssl, and a non …
Browse files Browse the repository at this point in the history
…standard version of clang/gcc (or a < OSX 10.9 version of clang/gcc)
  • Loading branch information
arr2036 committed Jun 24, 2014
1 parent 393752a commit 254f0df
Show file tree
Hide file tree
Showing 67 changed files with 4,515 additions and 1,858 deletions.
203 changes: 147 additions & 56 deletions src/modules/rlm_counter/configure

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/modules/rlm_counter/configure.ac
Expand Up @@ -57,8 +57,9 @@ if test x"$fail" != x""; then
fi
fi

mod_ldflags=$SMART_LIBS
mod_cflags=$SMART_CFLAGS
mod_ldflags="$SMART_LIBS"
mod_cflags="$SMART_CPPFLAGS"

AC_SUBST(mod_ldflags)
AC_SUBST(mod_cflags)
AC_SUBST(targetname)
Expand Down
29 changes: 15 additions & 14 deletions src/modules/rlm_eap/configure
Expand Up @@ -157,7 +157,7 @@ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
as_fn_exit 255
fi
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
Expand Down Expand Up @@ -237,7 +237,7 @@ IFS=$as_save_IFS

if test "x$CONFIG_SHELL" != x; then :
export CONFIG_SHELL
# We cannot yet assume a decent shell, so we have to provide a
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
# Preserve -v and -x to the replacement shell.
Expand Down Expand Up @@ -1210,9 +1210,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
[$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
[PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
Expand Down Expand Up @@ -1255,10 +1255,10 @@ Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
you have headers in a nonstandard directory <include dir>
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Expand Down Expand Up @@ -1835,7 +1835,7 @@ else
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
Expand Down Expand Up @@ -2057,7 +2057,7 @@ $as_echo "$ac_try_echo"; } >&5
if test -s conftest.err; then
sed '10a\
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
fi
rm -f conftest.er1 conftest.err
Expand Down Expand Up @@ -2603,8 +2603,9 @@ if test x"$eapsubdirs" = x""; then
eaptypes=""
fi
mod_ldflags=$SMART_LIBS
mod_cflags=$SMART_CFLAGS
mod_ldflags="$SMART_LIBS"
mod_cflags="$SMART_CPPFLAGS"
Expand Down Expand Up @@ -2683,11 +2684,11 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
if test ! -f "$cache_file" || test -h "$cache_file"; then
cat confcache >"$cache_file"
else
case $cache_file in #(
*/* | ?:*)
case $cache_file in #(
*/* | ?:*)
mv -f confcache "$cache_file"$$ &&
mv -f "$cache_file"$$ "$cache_file" ;; #(
*)
*)
mv -f confcache "$cache_file" ;;
esac
fi
Expand Down Expand Up @@ -3189,7 +3190,7 @@ Usage: $0 [OPTION]... [TAG]...
-V, --version print version number and configuration settings, then exit
--config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
Expand Down
5 changes: 3 additions & 2 deletions src/modules/rlm_eap/configure.ac
Expand Up @@ -58,8 +58,9 @@ if test x"$eapsubdirs" = x""; then
eaptypes=""
fi

mod_ldflags=$SMART_LIBS
mod_cflags=$SMART_CFLAGS
mod_ldflags="$SMART_LIBS"
mod_cflags="$SMART_CPPFLAGS"

AC_SUBST(eaptypes)
AC_SUBST(mod_ldflags)
AC_SUBST(mod_cflags)
Expand Down

0 comments on commit 254f0df

Please sign in to comment.