diff --git a/configure b/configure index 7e457915ea..ff56784c9d 100755 --- a/configure +++ b/configure @@ -5179,7 +5179,6 @@ re-running configure" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOC" >&5 $as_echo "$LOC" >&6; } - aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe" aros_host_arch="darwin" host_cc_elf=no if [ -z ${SED+x} ]; then SED="gsed"; fi @@ -5203,8 +5202,22 @@ $as_echo "$as_me: WARNING: \"Unknown CPU for Darwin host -- $host_cpu\"" >&2;} ;; esac - aros_host_ldflags="$aros_host_ldflags -liconv" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include||g'`" + aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib||g'`" + + aros_host_ldflags="$aros_host_ldflags -liconv" ;; dragonfly*) diff --git a/configure.in b/configure.in index 4b6ae5806f..8019bd771f 100644 --- a/configure.in +++ b/configure.in @@ -352,7 +352,6 @@ case "$host_os" in please run 'xcode-select --install' before re-running configure])]) AC_MSG_RESULT($LOC) - aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe" aros_host_arch="darwin" host_cc_elf=no if [[ -z ${SED+x} ]]; then SED="gsed"; fi @@ -375,8 +374,24 @@ re-running configure])]) ;; esac - aros_host_ldflags="$aros_host_ldflags -liconv" + dnl Strip out the unsupported include paths... + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include/||g'`" + aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include||g'`" + aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe" + dnl Strip out the unsupported library paths... + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib/||g'`" + aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib||g'`" + + aros_host_ldflags="$aros_host_ldflags -liconv" ;; dragonfly*)