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/m4 | |
| 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/m4')
| -rw-r--r-- | Build/source/m4/kpse-cxx-hack.m4 | 10 | ||||
| -rw-r--r-- | Build/source/m4/kpse-fontconfig-flags.m4 | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4 index 53163208aab..8b265cce5de 100644 --- a/Build/source/m4/kpse-cxx-hack.m4 +++ b/Build/source/m4/kpse-cxx-hack.m4 @@ -67,9 +67,13 @@ using namespace std; #include <iostream.h> #endif]], [[cout <<"worksok\n";]])]) - 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/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4 index fd1e5406a6f..8151e84910a 100644 --- a/Build/source/m4/kpse-fontconfig-flags.m4 +++ b/Build/source/m4/kpse-fontconfig-flags.m4 @@ -31,7 +31,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" AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <fontconfig/fontconfig.h>]], [[FcObjectSet *os; FcInit();]])], |