diff options
author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-11-30 20:00:21 -0600 |
---|---|---|
committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-11-30 20:00:21 -0600 |
commit | 2f5baa23cd8281aac966c0d5f9b89e671ce91df6 (patch) | |
tree | 3650221dfe040ac815095f40f44471a2c88593d7 /macros.cygwin | |
parent | 559ed2998921b1271c21da3bf28f67445d7555b1 (diff) | |
download | cygwin-filesystem-2f5baa23cd8281aac966c0d5f9b89e671ce91df6.tar.gz cygwin-filesystem-2f5baa23cd8281aac966c0d5f9b89e671ce91df6.tar.xz cygwin-filesystem-2f5baa23cd8281aac966c0d5f9b89e671ce91df6.zip |
Forcefully disable /usr/bin/foo-config detection
If a foo-config script is missing from %{_cygwin_bindir} but is present
in /usr/bin, the latter will be found even though it is for the wrong
toolchain; use of this result will eventually lead to a compilation or
linking error.
Therefore it is not enough to specify foo-config locations which are in
%{_cygwin_bindir}, but disable detection of those only in /usr/bin as
well.
The FOO_CONFIG variables are also exported in config.cache form
(ac_cv_path_FOO_CONFIG) because many times the given variable is not
marked as special by AC_ARG_VAR.
Diffstat (limited to 'macros.cygwin')
-rw-r--r-- | macros.cygwin | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/macros.cygwin b/macros.cygwin index e49430a..70dfe8e 100644 --- a/macros.cygwin +++ b/macros.cygwin @@ -92,9 +92,16 @@ package or when debugging this package.\ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ CXXFLAGS=; export CXXFLAGS; \ fi; \ - for i in `ls %{_cygwin_bindir}/*|grep -- "-config\$"` ; do \ + for i in `ls %{_bindir}/*|grep -- "[-_]config\$"` ; do \ + case `basename $i` in pkg-config) continue ; esac ; \ + x=`basename $i|tr "a-z+-\." "A-ZX__"`; \ + declare -x $x="no" ; export $x; \ + declare -x ac_cv_path_$x="no" ; export ac_cv_path_$x; \ + done; \ + for i in `ls %{_cygwin_bindir}/*|grep -- "[-_]config\$"` ; do \ x=`basename $i|tr "a-z+-\." "A-ZX__"`; \ declare -x $x="$i" ; export $x; \ + declare -x ac_cv_path_$x="$i" ; export ac_cv_path_$x; \ done; \ if [ -x %{_cygwin_bindir}/autopoint ]; then \ eval gettext_`grep '^version=' %{_cygwin_bindir}/autopoint`; \ |