diff options
Diffstat (limited to 'Build/source/texk/tex4htk')
| -rwxr-xr-x | Build/source/texk/tex4htk/configure | 149 |
1 files changed, 29 insertions, 120 deletions
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 21464034feb..609ca52742a 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -1825,7 +1825,7 @@ darwin* | rhapsody*) esac ;; -freebsd*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3602,7 +3602,7 @@ else ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -4072,7 +4072,7 @@ freebsd1*) dynamic_linker=no ;; -freebsd*-gnu*) +kfreebsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -6306,98 +6306,10 @@ EOF fi -# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment. -# This test program is due to Mike Hibler <mike@cs.utah.edu>. -# We don't actually need to run this if we don't have putenv, but it -# doesn't hurt. -echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 -echo "configure:6315: checking whether putenv uses malloc" >&5 -if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - kb_cv_func_putenv_malloc=no -else - cat > conftest.$ac_ext <<EOF -#line 6323 "configure" -#include "confdefs.h" - -#define VAR "YOW_VAR" -#define STRING1 "GabbaGabbaHey" -#define STRING2 "Yow!!" /* should be shorter than STRING1 */ -extern char *getenv (); /* in case char* and int don't mix gracefully */ -extern char *malloc (); /* ditto */ -main () -{ - char *str1, *rstr1, *str2, *rstr2; - str1 = getenv (VAR); - if (str1) - exit (1); - str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1); - if (str1 == 0) - exit (2); - strcpy (str1, VAR); - strcat (str1, "="); - strcat (str1, STRING1); - if (putenv (str1) < 0) - exit (3); - rstr1 = getenv (VAR); - if (rstr1 == 0) - exit (4); - rstr1 -= strlen (VAR) + 1; - if (strncmp (rstr1, VAR, strlen (VAR))) - exit (5); - str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1); - if (str2 == 0 || str1 == str2) - exit (6); - strcpy (str2, VAR); - strcat (str2, "="); - strcat (str2, STRING2); - if (putenv (str2) < 0) - exit (7); - rstr2 = getenv (VAR); - if (rstr2 == 0) - exit (8); - rstr2 -= strlen (VAR) + 1; -#if 0 - printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2); - /* - * If string from first call was reused for the second call, - * you had better not do a free on the first string! - */ - if (rstr1 == rstr2) - printf ("#define SMART_PUTENV\n"); - else - printf ("#undef SMART_PUTENV\n"); -#endif - exit (rstr1 == rstr2 ? 0 : 1); -} -EOF -if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - kb_cv_func_putenv_malloc=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - kb_cv_func_putenv_malloc=no -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6 -if test $kb_cv_func_putenv_malloc = yes; then - cat >> confdefs.h <<\EOF -#define SMART_PUTENV 1 -EOF - -fi - if test $ac_cv_func_getcwd = yes; then # We only need to run this if we have getcwd. echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6 -echo "configure:6401: checking whether getcwd uses fork or vfork" >&5 +echo "configure:6313: checking whether getcwd uses fork or vfork" >&5 if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6405,7 +6317,7 @@ else kb_cv_func_getcwd_forks=no else cat > conftest.$ac_ext <<EOF -#line 6409 "configure" +#line 6321 "configure" #include "confdefs.h" int fork() { exit(1); } @@ -6417,7 +6329,7 @@ getcwd(path,100); return 0; } EOF -if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_getcwd_forks=no else @@ -6442,7 +6354,7 @@ fi # Common --with and --enable options. echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:6446: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6358: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -6461,7 +6373,7 @@ fi echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:6465: checking for loader (symbol LD)" >&5 +echo "configure:6377: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6475,7 +6387,7 @@ echo "$ac_t""$LD" 1>&6 echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:6479: checking for archiver (symbol AR)" >&5 +echo "configure:6391: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6489,7 +6401,7 @@ echo "$ac_t""$AR" 1>&6 echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 -echo "configure:6493: checking for archiver options (symbol ARFLAGS)" >&5 +echo "configure:6405: checking for archiver options (symbol ARFLAGS)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6559,14 +6471,13 @@ fi echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:6563: checking where the main texmf tree is located" >&5 +echo "configure:6475: checking where the main texmf tree is located" >&5 +case $prefix in + */) prefix=`echo "$prefix" | sed 's@/*$@@'`;; +esac texmfmain= -if test -n "$TEXMFMAIN"; then - texmfmain="$TEXMFMAIN" - echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6 - -elif test "x$datadir" != 'x${prefix}/share'; then - # datadir is explicitly defined, assume datadir/texmf. +if test "x$datadir" != 'x${prefix}/share'; then + # First case, datadir is defined... eval p=\"$datadir\" # Unconditionally set the directory, but... texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'` @@ -6575,17 +6486,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then echo "$ac_t"""$texmfmain"" 1>&6 else echo "$ac_t""not found" 1>&6 - echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2 - echo "configure: warning: proceeding anyway. + echo "configure: warning: No texmf tree found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * - * If you do not have the files, you should be able to find them * - * at the same place you got these sources, or from one of the * - * CTAN hosts. Good luck. * + * Error: The main texmf tree was not found. * + * If you do not have the files, you should be able to them from * + * the same place you got these sources from, or from one of the * + * CTAN hosts. * ***************************************************************** -" 1>&2 + Winging it." 1>&2 fi - else # Second case, datadir is default... if test "x$prefix" = "xNONE"; then @@ -6612,7 +6521,7 @@ else echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * + * Error: The main texmf tree was not found. * * Use the --datadir option to specify its parent directory. * * If you do not have the files, you should be able to them from * * the same place you got these sources from, or from one of the * @@ -6670,7 +6579,7 @@ fi # Is libm present. FIXME: do we need it at all? echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6674: checking for main in -lm" >&5 +echo "configure:6583: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6678,14 +6587,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 6682 "configure" +#line 6591 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6783,7 +6692,7 @@ fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:6787: checking size of int" >&5 +echo "configure:6696: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6791,7 +6700,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 6795 "configure" +#line 6704 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -6802,7 +6711,7 @@ main() exit(0); } EOF -if { (eval echo configure:6806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else |