f30397ed2a
With this change, texmf.cnf is handled properaly using CONF_FILES, and
tex-* packages can be shared by teTeX-3 and TeX Live 2008.
Bump PKGREVISION for teTeX-{texmf,bin}.
196 lines
6.3 KiB
Text
196 lines
6.3 KiB
Text
$NetBSD: patch-ab,v 1.2 2009/01/08 22:09:35 minskim Exp $
|
|
|
|
--- texk/configure.orig 2005-02-06 10:27:03.000000000 -0800
|
|
+++ texk/configure
|
|
@@ -774,7 +774,7 @@ echo > confdefs.h
|
|
|
|
# A filename unique to this package, relative to the directory that
|
|
# configure is in, which we can look for to find out if srcdir is correct.
|
|
-ac_unique_file=kpathsea/kpathsea.texi
|
|
+ac_unique_file=web2c/tex.web
|
|
|
|
# Find the source files, if location was not specified.
|
|
if test -z "$srcdir"; then
|
|
@@ -1463,6 +1463,50 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
|
|
# as few characters as possible. Prefer GNU sed if found.
|
|
|
|
|
|
+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
|
|
+echo "configure:1070: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 1075 "configure"
|
|
+#include "confdefs.h"
|
|
+#include <sys/types.h>
|
|
+#include <sys/wait.h>
|
|
+#ifndef WEXITSTATUS
|
|
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
|
|
+#endif
|
|
+#ifndef WIFEXITED
|
|
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
|
|
+#endif
|
|
+int main() {
|
|
+int s;
|
|
+wait (&s);
|
|
+s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
|
|
+; return 0; }
|
|
+EOF
|
|
+if { (eval echo configure:1091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+ rm -rf conftest*
|
|
+ ac_cv_header_sys_wait_h=yes
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ ac_cv_header_sys_wait_h=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
+
|
|
+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
|
|
+if test $ac_cv_header_sys_wait_h = yes; then
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define HAVE_SYS_WAIT_H 1
|
|
+EOF
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
|
|
# Check whether --with-bibtex8 or --without-bibtex8 was given.
|
|
if test "${with_bibtex8+set}" = set; then
|
|
@@ -6697,6 +6741,8 @@ for ac_option
|
|
do
|
|
case "\$ac_option" in
|
|
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
+ : Avoid regenerating within pkgsrc
|
|
+ exit 0
|
|
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
|
|
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
|
|
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
|
|
@@ -6711,7 +6757,7 @@ done
|
|
ac_given_srcdir=$srcdir
|
|
ac_given_INSTALL="$INSTALL"
|
|
|
|
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
|
+trap 'rm -fr `echo "Makefile ac_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
|
EOF
|
|
cat >> $CONFIG_STATUS <<EOF
|
|
|
|
@@ -6913,6 +6959,113 @@ s%@INSTALL@%$INSTALL%g
|
|
fi; done
|
|
rm -f conftest.s*
|
|
|
|
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
|
|
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
|
|
+#
|
|
+# ac_d sets the value in "#define NAME VALUE" lines.
|
|
+ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
|
|
+ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
|
|
+ac_dC='\3'
|
|
+ac_dD='%g'
|
|
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
|
|
+ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
|
+ac_uB='\([ ]\)%\1#\2define\3'
|
|
+ac_uC=' '
|
|
+ac_uD='\4%g'
|
|
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
|
|
+ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
|
+ac_eB='$%\1#\2define\3'
|
|
+ac_eC=' '
|
|
+ac_eD='%g'
|
|
+
|
|
+if test "${CONFIG_HEADERS+set}" != set; then
|
|
+EOF
|
|
+cat >> $CONFIG_STATUS <<EOF
|
|
+ CONFIG_HEADERS="ac_config.h"
|
|
+EOF
|
|
+cat >> $CONFIG_STATUS <<\EOF
|
|
+fi
|
|
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
|
|
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
+ case "$ac_file" in
|
|
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
|
|
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
+ *) ac_file_in="${ac_file}.in" ;;
|
|
+ esac
|
|
+
|
|
+ echo creating $ac_file
|
|
+
|
|
+ rm -f conftest.frag conftest.in conftest.out
|
|
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
|
|
+ cat $ac_file_inputs > conftest.in
|
|
+
|
|
+EOF
|
|
+
|
|
+# Transform confdefs.h into a sed script conftest.vals that substitutes
|
|
+# the proper values into ac_config.h.in to produce ac_config.h. And first:
|
|
+# Protect against being on the right side of a sed subst in config.status.
|
|
+# Protect against being in an unquoted here document in config.status.
|
|
+rm -f conftest.vals
|
|
+cat > conftest.hdr <<\EOF
|
|
+s/[\\&%]/\\&/g
|
|
+s%[\\$`]%\\&%g
|
|
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
|
|
+s%ac_d%ac_u%gp
|
|
+s%ac_u%ac_e%gp
|
|
+EOF
|
|
+sed -n -f conftest.hdr confdefs.h > conftest.vals
|
|
+rm -f conftest.hdr
|
|
+
|
|
+# This sed command replaces #undef with comments. This is necessary, for
|
|
+# example, in the case of _POSIX_SOURCE, which is predefined and required
|
|
+# on some systems where configure will not decide to define it.
|
|
+cat >> conftest.vals <<\EOF
|
|
+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
|
|
+EOF
|
|
+
|
|
+# Break up conftest.vals because some shells have a limit on
|
|
+# the size of here documents, and old seds have small limits too.
|
|
+
|
|
+rm -f conftest.tail
|
|
+while :
|
|
+do
|
|
+ ac_lines=`grep -c . conftest.vals`
|
|
+ # grep -c gives empty output for an empty file on some AIX systems.
|
|
+ if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
|
|
+ # Write a limited-size here document to conftest.frag.
|
|
+ echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
|
|
+ sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
|
|
+ echo 'CEOF
|
|
+ sed -f conftest.frag conftest.in > conftest.out
|
|
+ rm -f conftest.in
|
|
+ mv conftest.out conftest.in
|
|
+' >> $CONFIG_STATUS
|
|
+ sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
|
|
+ rm -f conftest.vals
|
|
+ mv conftest.tail conftest.vals
|
|
+done
|
|
+rm -f conftest.vals
|
|
+
|
|
+cat >> $CONFIG_STATUS <<\EOF
|
|
+ rm -f conftest.frag conftest.h
|
|
+ echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
|
|
+ cat conftest.in >> conftest.h
|
|
+ rm -f conftest.in
|
|
+ if cmp -s $ac_file conftest.h 2>/dev/null; then
|
|
+ echo "$ac_file is unchanged"
|
|
+ rm -f conftest.h
|
|
+ else
|
|
+ # Remove last slash and all that follows it. Not all systems have dirname.
|
|
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
|
|
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
|
|
+ # The file is in a subdirectory.
|
|
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
|
|
+ fi
|
|
+ rm -f $ac_file
|
|
+ mv conftest.h $ac_file
|
|
+ fi
|
|
+fi; done
|
|
+
|
|
EOF
|
|
cat >> $CONFIG_STATUS <<EOF
|
|
|