summaryrefslogtreecommitdiff
path: root/Build/source/texk/dtl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-07-16 17:37:55 +0000
committerKarl Berry <karl@freefriends.org>2006-07-16 17:37:55 +0000
commit198ad22677ede977cfdde0655559af4b179bf63f (patch)
tree993db467b0b9b516fcfedde97c389c59e062e75f /Build/source/texk/dtl
parent5fff74807ab16d24983d39ba647292555217ff73 (diff)
regenerate configure scripts with ./reautoconf
git-svn-id: svn://tug.org/texlive/trunk@1857 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dtl')
-rwxr-xr-xBuild/source/texk/dtl/configure157
1 files changed, 33 insertions, 124 deletions
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index c00e96b4367..009aed243f8 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -1824,7 +1824,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3601,7 +3601,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
@@ -4071,7 +4071,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6305,98 +6305,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:6314: 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 6322 "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:6376: \"$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:6400: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6312: 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
@@ -6404,7 +6316,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6320 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6416,7 +6328,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6332: \"$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
@@ -6441,7 +6353,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:6445: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6357: 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"
@@ -6460,7 +6372,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6464: checking for loader (symbol LD)" >&5
+echo "configure:6376: 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
@@ -6474,7 +6386,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6478: checking for archiver (symbol AR)" >&5
+echo "configure:6390: 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
@@ -6488,7 +6400,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6492: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6404: 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
@@ -6558,14 +6470,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6562: checking where the main texmf tree is located" >&5
+echo "configure:6474: 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'`
@@ -6574,17 +6485,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
@@ -6611,7 +6520,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 *
@@ -6669,7 +6578,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:6673: checking for main in -lm" >&5
+echo "configure:6582: 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
@@ -6677,14 +6586,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6681 "configure"
+#line 6590 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6597: \"$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,14 +6692,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:6787: checking whether char is unsigned" >&5
+echo "configure:6696: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 6794 "configure"
+#line 6703 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -6812,7 +6721,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6725 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -6822,7 +6731,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -6846,7 +6755,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6850: checking size of long" >&5
+echo "configure:6759: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6854,7 +6763,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6767 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6865,7 +6774,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else