diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-07 09:41:43 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-07 09:41:43 +0000 |
commit | 11293b79f0ccf96604337ec2614da0c094d14bd7 (patch) | |
tree | 6c3a0399b5b2dfd13dc80419a86c8c1f7815ac19 /Build/source/texk | |
parent | 49f2c7c161f6b4db98826deb5d6c220fc681206b (diff) |
build system: fix libfontconfig detection, cxx-hack for cygwin, and some cleanup
git-svn-id: svn://tug.org/texlive/trunk@12974 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-x | Build/source/texk/lcdf-typetools/configure | 10 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index b35e3d44bf3..84e354156de 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -17509,9 +17509,13 @@ cout <<"worksok\n"; return 0; } _ACEOF - flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm' - flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc' - flags_try2='-lgcc -lc -lgcc' + case $host in + *cygwin*) flags_try0='-static -static-libgcc'; + flags_try1='-lstdc++'; flags_try2=$flags_try1;; + *) flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm' + flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc' + flags_try2='-lgcc -lc -lgcc';; + esac kpse_save_LIBS=$LIBS cpp_link_hack=false for flags in "$flags_try1" "$flags_try2"; do diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3931574e757..24ea78626d3 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -17382,9 +17382,13 @@ cout <<"worksok\n"; return 0; } _ACEOF - flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm' - flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc' - flags_try2='-lgcc -lc -lgcc' + case $host in + *cygwin*) flags_try0='-static -static-libgcc'; + flags_try1='-lstdc++'; flags_try2=$flags_try1;; + *) flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm' + flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc' + flags_try2='-lgcc -lc -lgcc';; + esac kpse_save_LIBS=$LIBS cpp_link_hack=false for flags in "$flags_try1" "$flags_try2"; do @@ -18325,7 +18329,7 @@ else kpse_cv_fontconfig_includes= kpse_cv_fontconfig_libs='-lfontconfig' fi -CPPFLAGS="$with_fontconfig $CPPFLAGS" +CPPFLAGS="$kpse_cv_fontconfig_libs $CPPFLAGS" LIBS="$kpse_cv_fontconfig_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ |