[rkward-cvs] rkward/admin acinclude.m4.in.orig, NONE, 1.1 deps.am, NONE, 1.1 detect-autoconf.pl, NONE, 1.1 doxygen.sh, NONE, 1.1 oldinclude.m4.in, NONE, 1.1 pkg.m4.in, NONE, 1.1 Makefile.common, 1.2, 1.3 acinclude.m4.in, 1.14, 1.15 am_edit, 1.3, 1.4 bcheck.pl, 1.1, 1.2 compile, 1.1, 1.2 conf.change.pl, 1.2, 1.3 config.guess, 1.2, 1.3 config.pl, 1.2, 1.3 config.sub, 1.2, 1.3 configure.in.bot.end, 1.1, 1.2 configure.in.min, 1.1.1.1, 1.2 cvs.sh, 1.4, 1.5 debianrules, 1.2, 1.3 depcomp, 1.2, 1.3 install-sh, 1.2, 1.3 libtool.m4.in, 1.2, 1.3 ltmain.sh, 1.2, 1.3 missing, 1.2, 1.3 mkinstalldirs, 1.3, 1.4 ylwrap, 1.1.1.1, 1.2
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Wed Sep 13 12:16:32 UTC 2006
Update of /cvsroot/rkward/rkward/admin
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30338
Modified Files:
Makefile.common acinclude.m4.in am_edit bcheck.pl compile
conf.change.pl config.guess config.pl config.sub
configure.in.bot.end configure.in.min cvs.sh debianrules
depcomp install-sh libtool.m4.in ltmain.sh missing
mkinstalldirs ylwrap
Added Files:
acinclude.m4.in.orig deps.am detect-autoconf.pl doxygen.sh
oldinclude.m4.in pkg.m4.in
Log Message:
Updating admin dir. Hope it's the last time
Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/mkinstalldirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mkinstalldirs 27 Jul 2004 23:05:24 -0000 1.3
--- mkinstalldirs 13 Sep 2006 12:16:30 -0000 1.4
***************
*** 1,13 ****
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
! # Author: Noah Friedman <friedman at prep.ai.mit.edu>
# Created: 1993-05-16
! # Public domain
errstatus=0
! dirmode=""
usage="\
! Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
--- 1,25 ----
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
!
! scriptversion=2005-06-29.22
!
! # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
# Created: 1993-05-16
! # Public domain.
! #
! # This file is maintained in Automake, please report
! # bugs to <bug-automake at gnu.org> or send patches to
! # <automake-patches at gnu.org>.
errstatus=0
! dirmode=
usage="\
! Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
!
! Create each directory DIR (with mode MODE, if specified), including all
! leading file name components.
!
! Report bugs to <bug-automake at gnu.org>."
# process command line arguments
***************
*** 15,20 ****
case $1 in
-h | --help | --h*) # -h for help
! echo "$usage" 1>&2
! exit 0
;;
-m) # -m PERM arg
--- 27,32 ----
case $1 in
-h | --help | --h*) # -h for help
! echo "$usage"
! exit $?
;;
-m) # -m PERM arg
***************
*** 24,27 ****
--- 36,43 ----
shift
;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
--) # stop option processing
shift
***************
*** 51,65 ****
esac
case $dirmode in
'')
! if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi
;;
*)
! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
--- 67,101 ----
esac
+ # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+ # mkdir -p a/c at the same time, both will detect that a is missing,
+ # one will create a, then the other will try to create a and die with
+ # a "File exists" error. This is a problem when calling mkinstalldirs
+ # from a parallel make. We use --version in the probe to restrict
+ # ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
fi
;;
*)
! if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
! test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
***************
*** 68,78 ****
for file
do
! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
- pathcomp=
for d
do
! pathcomp="$pathcomp$d"
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
--- 104,122 ----
for file
do
! case $file in
! /*) pathcomp=/ ;;
! *) pathcomp= ;;
! esac
! oIFS=$IFS
! IFS=/
! set fnord $file
shift
+ IFS=$oIFS
for d
do
! test "x$d" = x && continue
!
! pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
***************
*** 85,103 ****
if test ! -d "$pathcomp"; then
! errstatus=$lasterr
else
! if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
! lasterr=""
! chmod "$dirmode" "$pathcomp" || lasterr=$?
! if test ! -z "$lasterr"; then
! errstatus=$lasterr
! fi
! fi
fi
fi
! pathcomp="$pathcomp/"
done
done
--- 129,147 ----
if test ! -d "$pathcomp"; then
! errstatus=$lasterr
else
! if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
! lasterr=
! chmod "$dirmode" "$pathcomp" || lasterr=$?
! if test ! -z "$lasterr"; then
! errstatus=$lasterr
! fi
! fi
fi
fi
! pathcomp=$pathcomp/
done
done
***************
*** 108,111 ****
# mode: shell-script
# sh-indentation: 2
# End:
- # mkinstalldirs ends here
--- 152,158 ----
# mode: shell-script
# sh-indentation: 2
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
# End:
Index: bcheck.pl
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/bcheck.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bcheck.pl 27 Jul 2004 23:05:24 -0000 1.1
--- bcheck.pl 13 Sep 2006 12:16:30 -0000 1.2
***************
*** 119,122 ****
--- 119,123 ----
s/0x[0-9a-fA-F]+/0x......../g;
s/base size=/size=/g;
+ s/\(\)\s*$//g;
s/base align=/align=/g;
Index: depcomp
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/depcomp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** depcomp 27 Jul 2004 23:05:24 -0000 1.2
--- depcomp 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 1,6 ****
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
! # Copyright 1999, 2000 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 1,8 ----
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
!
! scriptversion=2005-07-09.11
!
! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 16,21 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 18,23 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
! # 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 26,36 ****
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
- # `libtool' can also be set to `yes' or `no'.
! depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--- 28,70 ----
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+ case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+ Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+ Run PROGRAMS ARGS to compile a file, generating dependencies
+ as side-effects.
+
+ Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake at gnu.org>.
+ EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+ esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
! # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
! depfile=${depfile-`echo "$object" |
! sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
***************
*** 164,173 ****
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
! # in a .u file. This file always lives in the current directory.
! # Also, the AIX compiler puts `$object:' at the start of each line;
! # $object doesn't have directory information.
! stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
- outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
--- 198,207 ----
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
! # in a .u file. In older versions, this file always lives in the
! # current directory. Also, the AIX compiler puts `$object:' at the
! # start of each line; $object doesn't have directory information.
! # Version 6 uses the directory in both cases.
! stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
if test "$libtool" = yes; then
"$@" -Wc,-M
***************
*** 175,180 ****
"$@" -M
fi
-
stat=$?
if test $stat -eq 0; then :
else
--- 209,220 ----
"$@" -M
fi
stat=$?
+
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
***************
*** 184,187 ****
--- 224,228 ----
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
***************
*** 199,207 ****
icc)
! # Must come before tru64.
!
! # Intel's C compiler understands `-MD -MF file'. However
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
! # will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
--- 240,246 ----
icc)
! # Intel's C compiler understands `-MD -MF file'. However on
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
! # ICC 7.0 will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
***************
*** 211,214 ****
--- 250,259 ----
# sub/foo.c:
# sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
"$@" -MD -MF "$tmpdepfile"
***************
*** 220,243 ****
fi
rm -f "$depfile"
! # Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
! sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
! sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
tru64)
! # The Tru64 AIX compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
! # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
- tmpdepfile1="$object.d"
- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
if test "$libtool" = yes; then
"$@" -Wc,-MD
else
"$@" -MD
fi
--- 265,314 ----
fi
rm -f "$depfile"
! # Each line is of the form `foo.o: dependent.h',
! # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
! sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
! # Some versions of the HPUX 10.20 sed can't process this invocation
! # correctly. Breaking it into two sed invocations is a workaround.
! sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
! sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
tru64)
! # The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
! # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mecanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
***************
*** 246,262 ****
if test $stat -eq 0; then :
else
! rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
! if test -f "$tmpdepfile1"; then
! tmpdepfile="$tmpdepfile1"
! else
! tmpdepfile="$tmpdepfile2"
! fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
! # That's a space and a tab in the [].
! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
--- 317,332 ----
if test $stat -eq 0; then :
else
! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
! for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
! do
! test -f "$tmpdepfile" && break
! done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
! # That's a tab and a space in the [].
! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
***************
*** 271,302 ****
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
! # because we must use -o when running libtool.
! test -z "$dashmflag" && dashmflag=-M
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*) # this is libtool, let us make it quiet
! for arg
! do # cycle over the arguments
! case "$arg" in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
! set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
;;
esac
! "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
--- 341,380 ----
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout, regardless of -o.
! "$@" || exit $?
!
! # Remove the call to Libtool.
! if test "$libtool" = yes; then
! while test $1 != '--mode=compile'; do
! shift
! done
! shift
! fi
!
! # Remove `-o $object'.
! IFS=" "
! for arg
! do
! case $arg in
! -o)
! shift
! ;;
! $object)
! shift
! ;;
! *)
! set fnord "$@" "$arg"
! shift # fnord
! shift # $arg
;;
esac
! done
!
! test -z "$dashmflag" && dashmflag=-M
! # Require at least two characters before searching for `:'
! # in the target name. This is to cope with DOS-style filenames:
! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
! "$@" $dashmflag |
! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
***************
*** 316,349 ****
makedepend)
! # X makedepend
! (
! shift
! cleared=no
! for arg in "$@"; do
! case $cleared in no)
! set ""; shift
! cleared=yes
! esac
! case "$arg" in
! -D*|-I*)
! set fnord "$@" "$arg"; shift;;
! -*)
! ;;
! *)
! set fnord "$@" "$arg"; shift;;
! esac
done
! obj_suffix="`echo $object | sed 's/^.*\././'`"
! touch "$tmpdepfile"
! ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
! tail +3 "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
--- 394,431 ----
makedepend)
! "$@" || exit $?
! # Remove any Libtool call
! if test "$libtool" = yes; then
! while test $1 != '--mode=compile'; do
! shift
done
! shift
! fi
! # X makedepend
! shift
! cleared=no
! for arg in "$@"; do
! case $cleared in
! no)
! set ""; shift
! cleared=yes ;;
! esac
! case "$arg" in
! -D*|-I*)
! set fnord "$@" "$arg"; shift ;;
! # Strip any option that makedepend may not understand. Remove
! # the object too, otherwise makedepend will parse it as a source file.
! -*|$object)
! ;;
! *)
! set fnord "$@" "$arg"; shift ;;
! esac
! done
! obj_suffix="`echo $object | sed 's/^.*\././'`"
! touch "$tmpdepfile"
! ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
! sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
***************
*** 355,387 ****
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
! # because we must use -o when running libtool.
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*)
! for arg
! do # cycle over the arguments
! case $arg in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
! set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
;;
esac
! "$@" -E |
! sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
--- 437,474 ----
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout.
! "$@" || exit $?
!
! # Remove the call to Libtool.
! if test "$libtool" = yes; then
! while test $1 != '--mode=compile'; do
! shift
! done
! shift
! fi
!
! # Remove `-o $object'.
! IFS=" "
! for arg
! do
! case $arg in
! -o)
! shift
! ;;
! $object)
! shift
! ;;
! *)
! set fnord "$@" "$arg"
! shift # fnord
! shift # $arg
;;
esac
! done
!
! "$@" -E |
! sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
! -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
***************
*** 393,424 ****
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*)
! for arg
! do # cycle over the arguments
! case $arg in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
! ;;
esac
! "$@" -E |
! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
--- 480,504 ----
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
! "$@" || exit $?
! IFS=" "
! for arg
! do
! case "$arg" in
! "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
! set fnord "$@"
! shift
! shift
! ;;
! *)
set fnord "$@" "$arg"
! shift
! shift
! ;;
esac
! done
! "$@" -E |
! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
***************
*** 440,441 ****
--- 520,530 ----
exit 0
+
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
+ # End:
Index: debianrules
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/debianrules,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debianrules 27 Jul 2004 23:05:24 -0000 1.2
--- debianrules 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 8,119 ****
chomp $origPwd;
! $kde_confdir = "/etc/kde3";
! $kde_prefix = "/usr";
! $kde_bindir = "$kde_prefix/bin";
! $kde_includedir = "$kde_prefix/include/kde";
! $kde_libdir = "$kde_prefix/lib";
! $kde_cgidir = "$kde_prefix/lib/cgi-bin";
! $kde_moduledir = "$kde_prefix/lib/kde3";
! $kde_appsdir = "$kde_prefix/share/applnk";
! $kde_datadir = "$kde_prefix/share/apps";
! $kde_htmldir = "$kde_prefix/share/doc/kde/HTML";
! $kde_icondir = "$kde_prefix/share/icons";
! $kde_locale = "$kde_prefix/share/locale";
! $kde_mimedir = "$kde_prefix/share/mimelnk";
! $kde_servicesdir = "$kde_prefix/share/services";
! $kde_servicetypesdir = "$kde_prefix/share/servicetypes";
! $kde_sounddir = "$kde_prefix/share/sounds";
! $kde_templatesdir = "$kde_prefix/share/templates";
! $kde_wallpaperdir = "$kde_prefix/share/wallpapers";
!
! $mandir = "$kde_prefix/share/man";
! $infodir = "$kde_prefix/share/info";
! $sysconfdir = "/etc";
! $QTDIR = "/usr/share/qt3";
! $IDL = "$kde_bindir/cuteidl";
! $DCOPIDL = "$kde_bindir/dcopidl";
! $DCOPIDL2CPP = "$kde_bindir/dcopidl2cpp";
! $KDB2HTML = "$kde_bindir/kdb2html";
! $MCOPIDL = "$kde_bindir/mcopidl";
! $ARTSCCONFIG = "$kde_bindir/artsc-config";
if (defined $ENV{DEB_BUILD_OPTIONS} &&
! $ENV{DEB_BUILD_OPTIONS} =~ /\bdebug\b/) {
! $enable_debug="--enable-debug=full";
! $enable_final="";
! }
! else {
! $enable_debug="--disable-debug";
! if (defined $ENV{DEB_BUILD_OPTIONS} &&
! $ENV{DEB_BUILD_OPTIONS} =~ /\bfinal\b/) {
! $enable_final="--enable-final";
! } else {
! $enable_final="";
! }
}
if (@ARGV && $ARGV[0] eq 'echodirs') {
- print STDOUT "export kde_confdir=$kde_confdir\n";
print STDOUT "export kde_prefix=$kde_prefix\n";
! print STDOUT "export kde_bindir=$kde_bindir\n";
print STDOUT "export kde_includedir=$kde_includedir\n";
- print STDOUT "export kde_libdir=$kde_libdir\n";
- print STDOUT "export kde_cgidir=$kde_cgidir\n";
- print STDOUT "export kde_moduledir=$kde_moduledir\n";
- print STDOUT "export kde_appsdir=$kde_appsdir\n";
- print STDOUT "export kde_datadir=$kde_datadir\n";
- print STDOUT "export kde_htmldir=$kde_htmldir\n";
- print STDOUT "export kde_icondir=$kde_icondir\n";
- print STDOUT "export kde_locale=$kde_locale\n";
- print STDOUT "export kde_mimedir=$kde_mimedir\n";
- print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
- print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
- print STDOUT "export kde_sounddir=$kde_sounddir\n";
- print STDOUT "export kde_templatesdir=$kde_templatesdir\n";
- print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-
- print STDOUT "export mandir=$mandir\n";
print STDOUT "export infodir=$infodir\n";
! print STDOUT "export sysconfdir=$sysconfdir\n";
! print STDOUT "export QTDIR=$QTDIR\n";
! print STDOUT "export IDL=$IDL\n";
! print STDOUT "export DCOPIDL=$DCOPIDL\n";
! print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n";
! print STDOUT "export KDB2HTML=$KDB2HTML\n";
! print STDOUT "export MCOPIDL=$MCOPIDL\n";
! print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
! print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
! print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
! print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama\n";
! print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
exit
}
-
- if (@ARGV && $ARGV[0] eq 'echoglobals') {
- print STDOUT "[Directories]\n";
- print STDOUT "dir_config=$kde_confdir\n";
- print STDOUT "dir_tmp=/tmp\n";
- print STDOUT "dir_socket=/tmp\n";
- print STDOUT "dir_exe=$kde_bindir\n";
- print STDOUT "dir_lib=$kde_libdir\n";
- print STDOUT "dir_cgi=$kde_cgidir\n";
- print STDOUT "dir_module=$kde_moduledir\n";
- print STDOUT "dir_apps=$kde_appsdir\n";
- print STDOUT "dir_data=$kde_datadir\n";
- print STDOUT "dir_html=$kde_htmldir\n";
- print STDOUT "dir_icon=$kde_icondir\n";
- print STDOUT "dir_locale=$kde_locale\n";
- print STDOUT "dir_mime=$kde_mimedir\n";
- print STDOUT "dir_services=$kde_servicesdir\n";
- print STDOUT "dir_servicetypes=$kde_servicetypesdir\n";
- print STDOUT "dir_sound=$kde_sounddir\n";
- print STDOUT "dir_templates=$kde_templatesdir\n";
- print STDOUT "dir_wallpaper=$kde_wallpaperdir\n";
- print STDOUT "[General]\n";
- print STDOUT "TerminalApplication=x-terminal-emulator\n";
- exit
- }
--- 8,43 ----
chomp $origPwd;
! $kde_prefix = "/usr";
! $sysconfdir = "/etc";
! $kde_includedir = "$kde_prefix/include/kde";
! $infodir = "$kde_prefix/share/info";
! $mandir = "$kde_prefix/share/man";
! $qtdir = "/usr/share/qt3";
! $kde_cgidir = "$kde_prefix/lib/cgi-bin";
! $kde_confdir = "$sysconfdir/kde3";
! $kde_htmldir = "$kde_prefix/share/doc/kde/HTML";
if (defined $ENV{DEB_BUILD_OPTIONS} &&
! $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
! $enable_debug="--enable-debug=full";
! } else {
! $enable_debug="--disable-debug";
}
if (@ARGV && $ARGV[0] eq 'echodirs') {
print STDOUT "export kde_prefix=$kde_prefix\n";
! print STDOUT "export sysconfdir=$sysconfdir\n";
print STDOUT "export kde_includedir=$kde_includedir\n";
print STDOUT "export infodir=$infodir\n";
! print STDOUT "export mandir=$mandir\n";
! print STDOUT "export qtdir=$qtdir\n";
! print STDOUT "export kde_cgidir=$kde_cgidir\n";
! print STDOUT "export kde_confdir=$kde_confdir\n";
! print STDOUT "export kde_htmldir=$kde_htmldir\n";
! print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
exit
}
Index: config.guess
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.guess 27 Jul 2004 23:05:24 -0000 1.2
--- config.guess 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 2,8 ****
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002 Free Software Foundation, Inc.
! timestamp='2002-10-21'
# This file is free software; you can redistribute it and/or modify it
--- 2,8 ----
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
[...1865 lines suppressed...]
c4*)
echo c4-convex-bsd
! exit ;;
esac
fi
***************
*** 1324,1328 ****
download the most up to date version of the config scripts from
! ftp://ftp.gnu.org/pub/gnu/config/
If the version you run ($0) is already up to date, please
--- 1423,1429 ----
download the most up to date version of the config scripts from
! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
! and
! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
Index: config.sub
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/config.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.sub 27 Jul 2004 23:05:24 -0000 1.2
--- config.sub 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 2,8 ****
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002 Free Software Foundation, Inc.
! timestamp='2002-09-05'
# This file is (in principle) common to ALL GNU software.
--- 2,8 ----
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
! timestamp='2005-07-01'
# This file is (in principle) common to ALL GNU software.
***************
*** 22,28 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
!
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
--- 22,28 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
! # 02110-1301, USA.
! #
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
***************
*** 30,33 ****
--- 30,34 ----
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
***************
*** 71,75 ****
GNU config.sub ($timestamp)
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
--- 72,76 ----
GNU config.sub ($timestamp)
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
***************
*** 84,92 ****
case $1 in
--time-stamp | --time* | -t )
! echo "$timestamp" ; exit 0 ;;
--version | -v )
! echo "$version" ; exit 0 ;;
--help | --h* | -h )
! echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
--- 85,93 ----
case $1 in
--time-stamp | --time* | -t )
! echo "$timestamp" ; exit ;;
--version | -v )
! echo "$version" ; exit ;;
--help | --h* | -h )
! echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
***************
*** 100,104 ****
# First pass through any local machine types.
echo $1
! exit 0;;
* )
--- 101,105 ----
# First pass through any local machine types.
echo $1
! exit ;;
* )
***************
*** 119,123 ****
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
--- 120,125 ----
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 145,149 ****
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! -apple | -axis)
os=
basic_machine=$1
--- 147,151 ----
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
***************
*** 229,240 ****
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
! | ip2k \
! | m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
--- 231,244 ----
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | bfin \
! | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
! | ip2k | iq2000 \
! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
***************
*** 245,270 ****
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
| mipsisa64 | mipsisa64el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| ns16k | ns32k \
! | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
! | tahoe | thumb | tic80 | tron \
| v850 | v850e \
| we32k \
! | x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
--- 249,283 ----
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | ms1 \
+ | msp430 \
| ns16k | ns32k \
! | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
! | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
! | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
+ m32c)
+ basic_machine=$basic_machine-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
***************
*** 294,300 ****
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
! | bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
! | clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
--- 307,313 ----
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
! | bfin-* | bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
! | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
***************
*** 303,310 ****
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
! | ip2k-* \
! | m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! | m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
--- 316,323 ----
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
! | ip2k-* | iq2000-* \
! | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
***************
*** 315,323 ****
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! | mipstx39 | mipstx39el \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
--- 328,342 ----
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! | mipstx39-* | mipstx39el-* \
! | mmix-* \
! | ms1-* \
! | msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
***************
*** 326,341 ****
| pyramid-* \
| romp-* | rs6000-* \
! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! | xtensa-* \
| ymp-* \
| z8k-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
--- 345,365 ----
| pyramid-* \
| romp-* | rs6000-* \
! | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
! | sparclite-* \
! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* \
! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
! | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
+ m32c-*)
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
***************
*** 354,357 ****
--- 378,384 ----
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
***************
*** 368,371 ****
--- 395,404 ----
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
***************
*** 427,436 ****
--- 460,484 ----
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
***************
*** 455,458 ****
--- 503,510 ----
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
***************
*** 633,640 ****
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
--- 685,688 ----
***************
*** 724,730 ****
os=-proelf
;;
! or32 | or32-*)
basic_machine=or32-unknown
! os=-coff
;;
OSE68000 | ose68000)
--- 772,781 ----
os=-proelf
;;
! openrisc | openrisc-*)
basic_machine=or32-unknown
! ;;
! os400)
! basic_machine=powerpc-ibm
! os=-os400
;;
OSE68000 | ose68000)
***************
*** 759,765 ****
basic_machine=i686-pc
;;
! pentiumii | pentium2)
basic_machine=i686-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
--- 810,819 ----
basic_machine=i686-pc
;;
! pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
***************
*** 768,774 ****
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
! pentiumii-* | pentium2-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
--- 822,831 ----
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
! pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
***************
*** 829,832 ****
--- 886,893 ----
basic_machine=mipsisa64sb1el-unknown
;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
***************
*** 836,839 ****
--- 897,903 ----
os=-hms
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
***************
*** 902,909 ****
os=-dynix
;;
- t3d)
- basic_machine=alpha-cray
- os=-unicos
- ;;
t3e)
basic_machine=alphaev5-cray
--- 966,969 ----
***************
*** 914,925 ****
os=-unicos
;;
- tic4x | c4x*)
- basic_machine=tic4x-unknown
- os=-coff
- ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
tx39)
basic_machine=mipstx39-unknown
--- 974,989 ----
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
***************
*** 935,938 ****
--- 999,1006 ----
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
***************
*** 978,984 ****
os=-proelf
;;
! windows32)
! basic_machine=i386-pc
! os=-windows32-msvcrt
;;
xps | xps100)
--- 1046,1052 ----
os=-proelf
;;
! xbox)
! basic_machine=i686-pc
! os=-mingw32
;;
xps | xps100)
***************
*** 1012,1015 ****
--- 1080,1086 ----
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
***************
*** 1028,1038 ****
basic_machine=we32k-att
;;
! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
basic_machine=sh-unknown
;;
! sh64)
! basic_machine=sh64-unknown
! ;;
! sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
--- 1099,1106 ----
basic_machine=we32k-att
;;
! sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
! sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
***************
*** 1107,1122 ****
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
--- 1175,1192 ----
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
! | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
! | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
***************
*** 1130,1135 ****
esac
;;
-nto*)
! os=-nto-qnx
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--- 1200,1207 ----
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
! os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
***************
*** 1140,1143 ****
--- 1212,1218 ----
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
***************
*** 1152,1155 ****
--- 1227,1233 ----
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
***************
*** 1173,1176 ****
--- 1251,1257 ----
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
***************
*** 1195,1198 ****
--- 1276,1282 ----
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
***************
*** 1225,1228 ****
--- 1309,1321 ----
os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
***************
*** 1256,1259 ****
--- 1349,1355 ----
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
***************
*** 1302,1305 ****
--- 1398,1404 ----
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
***************
*** 1434,1440 ****
--- 1533,1545 ----
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
***************
*** 1461,1465 ****
echo $basic_machine$os
! exit 0
# Local variables:
--- 1566,1570 ----
echo $basic_machine$os
! exit
# Local variables:
Index: Makefile.common
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/Makefile.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.common 27 Jul 2004 23:05:24 -0000 1.2
--- Makefile.common 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 7,11 ****
SHELL=/bin/sh
! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
@admindir=$(admindir); \
if test "x$$admindir" = x; then \
--- 7,11 ----
SHELL=/bin/sh
! cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
@admindir=$(admindir); \
if test "x$$admindir" = x; then \
***************
*** 31,35 ****
configure.files: subdirs
.SILENT:
! .PHONY: cvs dist cvs-clean package-merge package-messages
--- 31,37 ----
configure.files: subdirs
+ svn: cvs
+
.SILENT:
! .PHONY: svn cvs dist package-merge package-messages
--- NEW FILE: deps.am ---
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
# defining default rules for files that may not be present
$(top_srcdir)/Makefile.am.in:
$(CONF_FILES):
Index: cvs.sh
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cvs.sh 13 Sep 2006 10:56:30 -0000 1.4
--- cvs.sh 13 Sep 2006 12:16:30 -0000 1.5
***************
*** 7,10 ****
--- 7,12 ----
# and then does a case to call the correct function.
+ unset MAKEFLAGS
+
call_and_fix_autoconf()
{
***************
*** 21,26 ****
strip_makefile()
{
! if test -f $makefile_wo; then :; else
! perl -e '$in=0; while ( <> ) { $in = 1 if ($_=~ m/^if /); print $_ unless ($in); $in = 0 if ($_ =~ m/^endif/); }' < Makefile.am.in > $makefile_wo
fi
}
--- 23,28 ----
strip_makefile()
{
! if test ! -f $makefile_wo; then
! perl -e '$in=0; while ( <> ) { $in = 1 if ($_ =~ m/^if / ); print $_ unless ($in || $_ =~ m/^include /); $in = 0 if ($_ =~ m/^endif/); }' < $makefile_am > $makefile_wo
fi
}
***************
*** 28,31 ****
--- 30,34 ----
check_autotool_versions()
{
+ required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
***************
*** 33,46 ****
"" )
echo "*** AUTOCONF NOT FOUND!."
! echo "*** KDE requires autoconf 2.52, 2.53 or 2.54 or 2.6x"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOCONF_VERSION."
! echo "*** KDE requires autoconf 2.52, 2.53 or 2.54 or 2.6x"
exit 1
;;
esac
!
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
--- 36,49 ----
"" )
echo "*** AUTOCONF NOT FOUND!."
! echo "*** KDE requires autoconf $required_autoconf_version"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOCONF_VERSION."
! echo "*** KDE requires autoconf $required_autoconf_version"
exit 1
;;
esac
!
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
***************
*** 48,57 ****
"" )
echo "*** AUTOHEADER NOT FOUND!."
! echo "*** KDE requires autoheader 2.52 or 2.53 or 2.6x (part of autoconf)"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOHEADER_VERSION."
! echo "*** KDE requires autoheader 2.52 or 2.53 or 2.6x (part of autoconf)"
exit 1
;;
--- 51,60 ----
"" )
echo "*** AUTOHEADER NOT FOUND!."
! echo "*** KDE requires autoheader $required_autoconf_version"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOHEADER_VERSION."
! echo "*** KDE requires autoheader $required_autoconf_version"
exit 1
;;
***************
*** 59,84 ****
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
case $AUTOMAKE_STRING in
automake*1.5d* | automake*1.5* | automake*1.5-* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.6.1 or newer"
exit 1
;;
! automake*1.6.* | automake*1.7* | automake*1.8.* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
! echo "*** KDE requires automake 1.6.1 or newer"
exit 1
;;
! unsermake* ) :
echo "*** YOU'RE USING UNSERMAKE."
echo "*** GOOD LUCK!! :)"
;;
* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.6"
exit 1
;;
esac
}
--- 62,93 ----
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ required_automake_version="1.6.1 or newer"
case $AUTOMAKE_STRING in
automake*1.5d* | automake*1.5* | automake*1.5-* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake $required_automake_version"
exit 1
;;
! automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
! echo "*** $AUTOMAKE_STRING found."
! UNSERMAKE=no
! ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
! echo "*** KDE requires automake $required_automake_version"
exit 1
;;
! *unsermake* ) :
echo "*** YOU'RE USING UNSERMAKE."
echo "*** GOOD LUCK!! :)"
+ UNSERMAKE=unsermake
;;
* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake $required_automake_version"
exit 1
;;
esac
+ unset required_automake_version
}
***************
*** 86,98 ****
{
check_autotool_versions
!
! ### Produce acinclude.m4
! if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
! echo "*** Creating acinclude.m4"
! rm -f acinclude.m4 configure.files
!
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4
! fi
### Make new subdirs and configure.in.
--- 95,99 ----
{
check_autotool_versions
! acinclude_m4
### Make new subdirs and configure.in.
***************
*** 113,124 ****
fi
fi
- echo "*** Creating configure.in"
configure_files
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
fi
echo "*** Creating aclocal.m4"
! $ACLOCAL || exit 1
echo "*** Creating configure"
call_and_fix_autoconf
--- 114,129 ----
fi
fi
configure_files
! echo "*** Creating configure.in"
! if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
! else
! configure_in
! fi
fi
echo "*** Creating aclocal.m4"
! $ACLOCAL $ACLOCALFLAGS || exit 1
echo "*** Creating configure"
call_and_fix_autoconf
***************
*** 127,135 ****
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
fi
echo "*** Creating Makefile templates"
$AUTOMAKE || exit 1
! if test -z "$UNSERMAKE"; then
echo "*** Postprocessing Makefile templates"
perl -w admin/am_edit || exit 1
--- 132,142 ----
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
+ touch config.h.in
fi
echo "*** Creating Makefile templates"
$AUTOMAKE || exit 1
!
! if test "$UNSERMAKE" = no; then
echo "*** Postprocessing Makefile templates"
perl -w admin/am_edit || exit 1
***************
*** 156,174 ****
### First build all of the files necessary to do just "make"
###
! if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4
! fi
if test -r configure.in.in; then
create_subdirs
! Makefile_am
configure_files
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./configure.in
fi
- $ACLOCAL
- $AUTOHEADER
- $AUTOMAKE --foreign --include-deps
- perl -w admin/am_edit
call_and_fix_autoconf
touch stamp-h.in
--- 163,198 ----
### First build all of the files necessary to do just "make"
###
! acinclude_m4
if test -r configure.in.in; then
+ rm -f configure.in
create_subdirs
!
! if test -r Makefile.am.in; then
! if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
! else
! Makefile_am
! fi
! fi
configure_files
! if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then
! strip_makefile
! $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
! else
! configure_in
! fi
! fi
! $ACLOCAL $ACLOCALFLAGS
! if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
! echo "*** Creating config.h template"
! $AUTOHEADER || exit 1
! touch config.h.in
! fi
! $AUTOMAKE --foreign || exit 1
! if test "$UNSERMAKE" = no; then
! echo "*** Postprocessing Makefile templates"
! perl -w admin/am_edit || exit 1
fi
call_and_fix_autoconf
touch stamp-h.in
***************
*** 196,203 ****
subdir_dist()
{
! $ACLOCAL
$AUTOHEADER
$AUTOMAKE
! perl -w ../admin/am_edit
call_and_fix_autoconf
touch stamp-h.in
--- 220,234 ----
subdir_dist()
{
! $ACLOCAL $ACLOCALFLAGS
$AUTOHEADER
+ touch config.h.in
$AUTOMAKE
! AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
! case $AUTOMAKE_STRING in
! *unsermake* ) :
! ;;
! *)
! perl -w ../admin/am_edit --path=../admin
! esac
call_and_fix_autoconf
touch stamp-h.in
***************
*** 209,227 ****
kde_use_qt_param=
test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
! cat `fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"` > configure.in.new
echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new
if test -f Makefile.am.in; then
subdirs=`cat subdirs`
for dir in $subdirs; do
! dir=`echo $dir | sed -e "s,[-+.],_,g"`
! echo "AM_CONDITIONAL($dir""_SUBDIR_included, test \"x\$$dir""_SUBDIR_included\" = xyes)" >> configure.in.new
done
fi
echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
- if test -n "$UNSERMAKE"; then
- echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
- echo "AC_CONFIG_FILES([ Makefile.calls ])" >> configure.in.new
- fi
if test -f inst-apps; then
--- 240,267 ----
kde_use_qt_param=
test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
! list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
! : > configure.in.new
! for file in $list; do
! echo "dnl =======================================================" >> configure.in.new
! echo "dnl FILE: $file" >> configure.in.new
! echo "dnl =======================================================" >> configure.in.new
! echo "" >> configure.in.new
! cat $file >> configure.in.new
! done
echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new
if test -f Makefile.am.in; then
subdirs=`cat subdirs`
for dir in $subdirs; do
! vdir=`echo $dir | sed -e 's,[-+.@],_,g'`
! echo "AM_CONDITIONAL($vdir""_SUBDIR_included, test \"x\$$vdir""_SUBDIR_included\" = xyes)" >> configure.in.new
! if test -f "$dir/configure.in"; then
! echo "if test \"x\$$vdir""_SUBDIR_included\" = xyes; then " >> configure.in.new
! echo " AC_CONFIG_SUBDIRS($dir)" >> configure.in.new
! echo "fi" >> configure.in.new
! fi
done
fi
echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
if test -f inst-apps; then
***************
*** 244,255 ****
fi
! mfs=`find $topleveldir -name Makefile.am -print | fgrep -v "/." | \
sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
for i in $mfs; do
echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
- if test -n "$UNSERMAKE"; then
- echo "AC_CONFIG_FILES([ $i.rules ])" >> configure.in.new
- echo "AC_CONFIG_FILES([ $i.calls ])" >> configure.in.new
- fi
done
done
--- 284,291 ----
fi
! mfs=`find $topleveldir -follow -name Makefile.am -print | fgrep -v "/." | \
sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
for i in $mfs; do
echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
done
done
***************
*** 261,268 ****
done
- if test -n "$UNSERMAKE"; then
- echo "AC_CONFIG_FILES([ MakeVars ])" >> configure.in.new
- fi
-
midfiles=`cat configure.files | fgrep "configure.in.mid"`
test -n "$midfiles" && cat $midfiles >> configure.in.new
--- 297,300 ----
***************
*** 285,289 ****
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
! VERSION="\"3.1.0\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
--- 317,321 ----
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
! VERSION="\"3.5.4\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
***************
*** 308,311 ****
--- 340,344 ----
configure_files()
{
+ echo "*** Creating configure.files"
admindir=NO
for i in . .. ../.. ../../..; do
***************
*** 323,331 ****
list=""
for i in $inst; do
! list="$list `find $i/ -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
done
else
! list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
fi
--- 356,364 ----
list=""
for i in $inst; do
! list="$list `find $i/ -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
done
else
! list=`find . -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
fi
***************
*** 335,338 ****
--- 368,375 ----
test -f configure.in.mid && echo configure.in.mid >> configure.files
test -f configure.in.bot && echo configure.in.bot >> configure.files
+ if test ! -s configure.files; then
+ echo "There are no files to build a configure. Please check your checkout."
+ exit 1
+ fi
}
***************
*** 430,463 ****
done
! if test -n "$UNSERMAKE"; then
! cp Makefile.am.in Makefile.am
! chmod u+w Makefile.am
! topsubdirs=
! for i in $compilefirst $dirs $compilelast; do
! vari=`echo $i | sed -e "s,[-+],_,g"`
! echo "if $vari""_SUBDIR_included" >> Makefile.am
! echo "$vari""_SUBDIR=$i" >> Makefile.am
! echo "endif" >> Makefile.am
! topsubdirs="$topsubdirs \$($vari""_SUBDIR)"
done
! echo "SUBDIRS=$topsubdirs" >> Makefile.am
else
! cat Makefile.am.in | \
! sed -e 's,^\s*\(COMPILE_BEFORE.*\),# \1,' | \
! sed -e 's,^\s*\(COMPILE_AFTER.*\),# \1,' > Makefile.am
! echo "SUBDIRS="'$(TOPSUBDIRS)' >> Makefile.am
fi
fi
}
! cvs_clean()
{
! if test -d CVS; then :; else
! echo "You don't have a toplevel CVS directory."
! echo "You most certainly didn't use cvs to get these sources."
! echo "But this function depends on cvs's information."
! exit 1
! fi
! perl $admindir/cvs-clean.pl
}
--- 467,511 ----
done
! adds=`fgrep '$(top_srcdir)/acinclude.m4:' Makefile.am.in | sed -e 's,^[^:]*: *,,; s,\$(top_srcdir)/,,g'`
! if echo "$adds" | fgrep "*" >/dev/null ; then
! adds=`ls -d -1 $adds 2>/dev/null`
! fgrep -v '$(top_srcdir)/acinclude.m4:' Makefile.am.in > Makefile.am.in.adds
! str='$(top_srcdir)/acinclude.m4:'
! for add in $adds; do
! str="$str \$(top_srcdir)/$add"
done
! echo $str >> Makefile.am.in.adds
else
! cat Makefile.am.in > Makefile.am.in.adds
fi
+
+ cat Makefile.am.in.adds | \
+ sed -e 's,^\s*\(COMPILE_BEFORE.*\),# \1,' | \
+ sed -e 's,^\s*\(COMPILE_AFTER.*\),# \1,' > Makefile.am
+ echo "SUBDIRS="'$(TOPSUBDIRS)' >> Makefile.am
+ rm Makefile.am.in.adds
fi
}
! acinclude_m4()
{
! echo "*** Creating acinclude.m4"
! adds=
! if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
! strip_makefile
! rm -f acinclude.m4
! adds=`grep '\$(top_srcdir)/acinclude.m4:' $makefile_wo | sed -e 's,^[^:]*: *,,; s,\$(top_srcdir),.,g'`
! if echo $adds | fgrep "*" >/dev/null ; then
! adds=`ls -d -1 $adds 2>/dev/null`
! else
! $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4 || exit 1
! fi
! else
! rm -f acinclude.m4
! fi
! # if it wasn't created up to now, then we do it better
! if test ! -f acinclude.m4; then
! cat admin/acinclude.m4.in admin/libtool.m4.in admin/pkg.m4.in $adds > acinclude.m4
! fi
}
***************
*** 480,495 ****
}
! package_messages()
{
- rm -rf po.backup
- mkdir po.backup
-
- for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
- egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
- cp po/$i po.backup/backup_$i
- touch -r po/$i po.backup/backup_$i
- rm po/$i
- done
-
podir=${podir:-$PWD/po}
files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
--- 528,533 ----
}
! extract_messages()
{
podir=${podir:-$PWD/po}
files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
***************
*** 504,523 ****
(cd $subdir
if test -n "`grep -e '^messages:.*rc.cpp' Makefile.am`"; then
! $EXTRACTRC *.rc *.ui > rc.cpp
else
! candidates=`ls -1 *.rc *.ui 2>/dev/null`
if test -n "$candidates"; then
! echo "$subdir has *.rc or *.ui files, but not correct messages line"
fi
fi
! if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then
echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
else echo " " > _translatorinfo.cpp
fi
! perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
! $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
! XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
! messages
exit_code=$?
if test "$exit_code" != 0; then
--- 542,565 ----
(cd $subdir
if test -n "`grep -e '^messages:.*rc.cpp' Makefile.am`"; then
! $EXTRACTRC *.rc *.ui *.kcfg > rc.cpp
else
! candidates=`ls -1 *.rc *.ui *.kcfg 2>/dev/null`
if test -n "$candidates"; then
! echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
fi
fi
! if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q KAboutData ; then
echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
else echo " " > _translatorinfo.cpp
fi
! perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
! kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
! if ! test -f $kdepotpath; then
! kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
! fi
!
! $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
! XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
exit_code=$?
if test "$exit_code" != 0; then
***************
*** 531,544 ****
done
rm -f $tmpname
for i in `ls -1 po.backup/*.pot 2>/dev/null | sed -e "s#po.backup/##" | egrep -v '^backup_'`; do
test -f po/$i || echo "disappeared: $i"
done
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
! msgmerge -q -o po/$i po/$i po/$i
! egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
! if test -f po.backup/$i && test -n "`diff temp.pot po.backup/$i`"; then
! echo "will update $i"
! msgmerge -q po.backup/backup_$i po/$i > temp.pot
! mv temp.pot po/$i
else
if test -f po.backup/backup_$i; then
--- 573,601 ----
done
rm -f $tmpname
+ }
+
+ package_messages()
+ {
+ rm -rf po.backup
+ mkdir po.backup
+
+ for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
+ egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
+ cat po/$i > po.backup/backup_$i
+ touch -r po/$i po.backup/backup_$i
+ rm po/$i
+ done
+
+ extract_messages
+
for i in `ls -1 po.backup/*.pot 2>/dev/null | sed -e "s#po.backup/##" | egrep -v '^backup_'`; do
test -f po/$i || echo "disappeared: $i"
done
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
! sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
! #msgmerge -q -o po/$i po/$i po/$i
! egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
! if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then
! echo "will update $i"
else
if test -f po.backup/backup_$i; then
***************
*** 555,559 ****
}
! unset CDPATH
admindir=`echo "$0" | sed 's%[\\/][^\\/][^\\/]*$%%'`
test "x$admindir" = "x$0" && admindir=.
--- 612,623 ----
}
! # Make sure that sorting is always done the same way
! LC_ALL=C
! export LC_ALL
! unset LANG || :
! unset LC_CTYPE || :
! unset LANGUAGE || :
!
! unset CDPATH || :
admindir=`echo "$0" | sed 's%[\\/][^\\/][^\\/]*$%%'`
test "x$admindir" = "x$0" && admindir=.
***************
*** 561,572 ****
test "x$MAKE" = x && MAKE=make
makefile_am=Makefile.am
! makefile_wo=Makefile.am
if test -f Makefile.am.in; then
makefile_am=Makefile.am.in
makefile_wo=Makefile.am.in.wo
fi
! # Suck in the AUTOCONF detection code
! . $admindir/detect-autoconf.sh
###
--- 625,638 ----
test "x$MAKE" = x && MAKE=make
makefile_am=Makefile.am
! makefile_wo=Makefile.am.wo
if test -f Makefile.am.in; then
makefile_am=Makefile.am.in
makefile_wo=Makefile.am.in.wo
+ rm -f $makefile_wo
fi
! # Call script to find autoconf and friends. Uses eval since the script outputs
! # sh-compatible code.
! eval `$admindir/detect-autoconf.pl`
###
***************
*** 574,585 ****
###
! arg=`echo $1 | tr '\-.' __`
case $arg in
cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
! cvs_clean | package_merge | package_messages | Makefile_am ) $arg ;;
configure ) call_and_fix_autoconf ;;
* ) echo "Usage: cvs.sh <target>"
echo "Target can be one of:"
! echo " cvs cvs-clean dist"
echo " configure.in configure.files"
echo " package-merge package-messages"
--- 640,651 ----
###
! arg=`echo $1 | tr .- __`
case $arg in
cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
! cvs_clean | package_merge | package_messages | Makefile_am | acinclude_m4 | extract_messages ) $arg ;;
configure ) call_and_fix_autoconf ;;
* ) echo "Usage: cvs.sh <target>"
echo "Target can be one of:"
! echo " cvs svn dist"
echo " configure.in configure.files"
echo " package-merge package-messages"
***************
*** 589,594 ****
esac
! if test -f Makefile.am.in.wo; then
! rm Makefile.am.in.wo
fi
--- 655,660 ----
esac
! if test -f $makefile_wo; then
! rm $makefile_wo
fi
Index: config.pl
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/config.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.pl 27 Jul 2004 23:05:24 -0000 1.2
--- config.pl 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 26,31 ****
# You should have received a copy of the GNU Library General Public License
# along with this library; see the file COPYING.LIB. If not, write to
! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
use strict;
--- 26,31 ----
# You should have received a copy of the GNU Library General Public License
# along with this library; see the file COPYING.LIB. If not, write to
! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
! # Boston, MA 02110-1301, USA.
use strict;
***************
*** 54,57 ****
--- 54,58 ----
open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
my @subs = <CF>;
+ my $pat;
close(CF);
chomp @subs;
***************
*** 61,65 ****
if ($bad_perl) {
print "Using perl older than version 5.005\n";
! foreach my $pat (@subs) {
if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
|| ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
--- 62,66 ----
if ($bad_perl) {
print "Using perl older than version 5.005\n";
! foreach $pat (@subs) {
if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
|| ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
***************
*** 86,90 ****
}
} else {
! foreach my $pat (@subs) {
if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
--- 87,91 ----
}
} else {
! foreach $pat (@subs) {
if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
***************
*** 193,198 ****
my @infiles=split(' ', $infiles);
my $i=0;
! foreach my $name (@infiles) {
if (open(CF, "< $name")) {
while (<CF>) {
--- 194,200 ----
my @infiles=split(' ', $infiles);
my $i=0;
+ my $name;
! foreach $name (@infiles) {
if (open(CF, "< $name")) {
while (<CF>) {
--- NEW FILE: oldinclude.m4.in ---
### -*- autoconf -*-
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 1997 Janos Farkas (chexum at shadow.banki.hu)
dnl (C) 1997,98,99 Stephan Kulow (coolo at kde.org)
dnl This file is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Library General Public
dnl License as published by the Free Software Foundation; either
dnl version 2 of the License, or (at your option) any later version.
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Library General Public License for more details.
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([KDE_CHECK_MICO],
[
AC_REQUIRE([KDE_CHECK_LIBDL])
AC_REQUIRE([KDE_MISC_TESTS])
AC_MSG_CHECKING(for MICO)
if test -z "$MICODIR"; then
kde_micodir=/usr/local
else
kde_micodir="$MICODIR"
fi
AC_ARG_WITH(micodir,
[ --with-micodir=micodir where mico is installed ],
kde_micodir=$withval,
kde_micodir=$kde_micodir
)
AC_CACHE_VAL(kde_cv_mico_incdir,
[
mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes"
AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir)
])
kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'`
if test ! -r $kde_micodir/include/CORBA.h; then
AC_MSG_ERROR([No CORBA.h found, specify another micodir])
fi
AC_MSG_RESULT($kde_micodir)
MICO_INCLUDES=-I$kde_micodir/include
AC_SUBST(MICO_INCLUDES)
MICO_LDFLAGS=-L$kde_micodir/lib
AC_SUBST(MICO_LDFLAGS)
micodir=$kde_micodir
AC_SUBST(micodir)
AC_MSG_CHECKING([for MICO version])
AC_CACHE_VAL(kde_cv_mico_version,
[
AC_LANG_C
cat >conftest.$ac_ext <<EOF
#include <stdio.h>
#include <mico/version.h>
int main() {
printf("MICO_VERSION=%s\n",MICO_VERSION);
return (0);
}
EOF
ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest'
if AC_TRY_EVAL(ac_compile); then
if eval `./conftest 2>&5`; then
kde_cv_mico_version=$MICO_VERSION
else
AC_MSG_ERROR([your system is not able to execute a small application to
find MICO version! Check $kde_micodir/include/mico/version.h])
fi
else
AC_MSG_ERROR([your system is not able to compile a small application to
find MICO version! Check $kde_micodir/include/mico/version.h])
fi
])
dnl installed MICO version
mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
if test "x$1" = "x"; then
req_version="2.3.0"
else
req_version=$1
fi
dnl required MICO version
req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'`
req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'`
req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'`
if test "$mico_v_maj" -lt "$req_v_maj" || \
( test "$mico_v_maj" -eq "$req_v_maj" && \
test "$mico_v_mid" -lt "$req_v_mid" ) || \
( test "$mico_v_mid" -eq "$req_v_mid" && \
test "$mico_v_min" -lt "$req_v_min" )
then
AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \
at least is required. You should upgrade MICO.])
else
AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)])
fi
LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL"
AC_SUBST(LIBMICO)
if test -z "$IDL"; then
IDL='$(kde_bindir)/cuteidl'
fi
AC_SUBST(IDL)
IDL_DEPENDENCIES='$(kde_includes)/CUTE.h'
AC_SUBST(IDL_DEPENDENCIES)
idldir="\$(includedir)/idl"
AC_SUBST(idldir)
])
AC_DEFUN([KDE_CHECK_MINI_STL],
[
AC_REQUIRE([KDE_CHECK_MICO])
AC_MSG_CHECKING(if we use mico's mini-STL)
AC_CACHE_VAL(kde_cv_have_mini_stl,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_cxxflags="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $MICO_INCLUDES"
AC_TRY_COMPILE(
[
#include <mico/config.h>
],
[
#ifdef HAVE_MINI_STL
#error "nothing"
#endif
],
kde_cv_have_mini_stl=no,
kde_cv_have_mini_stl=yes)
CXXFLAGS="$kde_save_cxxflags"
AC_LANG_RESTORE
])
if test "x$kde_cv_have_mini_stl" = "xyes"; then
AC_MSG_RESULT(yes)
$1
else
AC_MSG_RESULT(no)
$2
fi
])
])
AC_DEFUN([KDE_CHECK_ANSI],
[
])
AC_DEFUN([KDE_CHECK_INSURE],
[
AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]],
[
if test $enableval = "no"; dnl
then ac_use_insure="no"
else ac_use_insure="yes"
fi
], [ac_use_insure="no"])
AC_MSG_CHECKING(if we will use Insure++ to debug)
AC_MSG_RESULT($ac_use_insure)
if test "$ac_use_insure" = "yes"; dnl
then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "????
fi
])
AC_DEFUN([KDE_CHECK_NEWLIBS],
[
])
--- NEW FILE: detect-autoconf.pl ---
#!/usr/bin/env perl
# Try to locate best version of auto*
# By Michael Pyne <michael.pyne at kdemail.net>
#
# Copyright (c) 2005.
# This code is public domain. You may use it however you like (including
# relicensing).
# Emulate the 'which' program.
sub which
{
my $prog = shift;
my @paths = split(/:/, $ENV{'PATH'});
for $path (@paths)
{
return "$path/$prog" if -x "$path/$prog";
}
return "";
}
# Subroutine to determine the highest installed version of the given program,
# searching from the given paths.
sub findBest
{
my ($program, @paths) = @_;
my $best_version_found = '0'; # Deliberately a string.
my %versions;
my %minimumVersions = (
'autoconf' => '2.5',
'automake' => '1.6',
);
# Allow user to use environment variable to override search.
return $ENV{uc $program} if $ENV{uc $program};
for $prefix (@paths)
{
@files = glob "$prefix/$program*";
for $file (@files)
{
# Don't check non-executable scripts.
next unless -x $file;
($version) = $file =~ /$prefix\/$program-?(.*)$/;
$version =~ s/-|\.//g;
# Special case some programs to make sure it has a minimum version.
if (not $version and exists $minimumVersions{$program})
{
my $min_version = $minimumVersions{$program};
my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
# If we can't run the script to get the version it likely won't work later.
next unless $versionOutput;
# Use number.number for version (we don't need the excess in general).
($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
# Use lt to do lexicographical comparison of strings (which should be
# equivalent and doesn't involve issues with floating point conversions).
if (not $versionOutput or $versionOutput lt $min_version)
{
next;
}
}
# If no version suffix then use it in favor of a versioned autotool
# since the ever-popular WANT_AUTOFOO should then work (in theory).
return $file unless $version;
# Emulate 'which', and abort if we've already seen this version.
next if exists $versions{$version};
# Save filename of program.
$versions{$version} = $file;
# Use string comparison so that e.g. 253a will be > 253 but < 254.
if ($version gt $best_version_found)
{
$best_version_found = $version;
}
}
}
return $versions{$best_version_found};
}
# Find an appropriate "which" program for later use by the shell script calling
# us.
sub findWhich
{
for $candidate ('type -p', 'which', 'type')
{
$test = `$candidate sh 2>/dev/null`;
chomp $test;
return $candidate if -x $test;
}
}
# Uses which() to find a program unless the user provided its path in the
# environment (the upper case program name is searched).
sub findProgram
{
$suffix = ""; # For use if @_ has only one param.
my ($program, $suffix) = @_;
return $ENV{uc $program} if $ENV{uc $program};
return which("$program$suffix");
}
# SCRIPT STARTS.
# Search in path.
@paths = split(/:/, $ENV{'PATH'});
# Make sure at least /usr/bin and /usr/local/bin are in this search.
unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths;
unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths;
$autoconf = findBest('autoconf', @paths);
($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/;
# Find matching autoconf companions.
$autoheader = findProgram('autoheader', $autoconf_suffix);
$autom4te = findProgram('autom4te', $autoconf_suffix);
# Get best automake, and look for unsermake to possibly override it.
$automake = findBest('automake', @paths);
$unsermake = "";
# backward compatible: if $UNSERMAKE points to a path, use it
$unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
# new compatible: if it says 'yes', use the one from path
$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
($automake_suffix) = $automake =~ /.*automake(.*)$/;
# Use unsermake if we found it.
$automake = "$unsermake -c" if $unsermake;
# Find matching automake companions.
$aclocal = findProgram('aclocal', $automake_suffix);
$which = findWhich();
# Make sure we have all of the needed programs.
for $i (qw'autoconf autoheader autom4te automake aclocal')
{
unless(${$i})
{
print "# Unable to find $i!!\n";
exit 1;
}
}
# Print results in eval-able form.
print <<EOF;
AUTOCONF="$autoconf"
AUTOHEADER="$autoheader"
AUTOM4TE="$autom4te"
AUTOMAKE="$automake"
ACLOCAL="$aclocal"
WHICH="$which"
export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH
EOF
exit 0;
Index: configure.in.min
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/configure.in.min,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.in.min 1 Nov 2002 01:09:40 -0000 1.1.1.1
--- configure.in.min 13 Sep 2006 12:16:30 -0000 1.2
***************
*** 14,19 ****
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! dnl Boston, MA 02111-1307, USA.
# Original Author was Kalle at kde.org
--- 14,19 ----
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
! dnl Boston, MA 02110-1301, USA.
# Original Author was Kalle at kde.org
Index: libtool.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/libtool.m4.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** libtool.m4.in 27 Jul 2004 23:05:24 -0000 1.2
--- libtool.m4.in 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 16,20 ****
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
! ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
##
## As a special exception to the GNU General Public License, if you
--- 16,20 ----
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
! ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
##
## As a special exception to the GNU General Public License, if you
***************
*** 1274,1278 ****
;;
! freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
--- 1274,1278 ----
;;
! kfreebsd*-gnu*)
version_type=linux
need_lib_prefix=no
***************
*** 2095,2099 ****
;;
! cygwin* | mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--- 2095,2103 ----
;;
! cygwin*)
! lt_cv_deplibs_check_method=pass_all
! ;;
!
! mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
***************
*** 2116,2120 ****
;;
! freebsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
--- 2120,2124 ----
;;
! freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
***************
*** 2557,2572 ****
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
*) # Darwin 1.3 on
! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
esac
output_verbose_link_cmd='echo'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
! _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--- 2561,2587 ----
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
;;
*) # Darwin 1.3 on
! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! else
! case ${MACOSX_DEPLOYMENT_TARGET} in
! 10.[012])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! ;;
! 10.*)
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
! ;;
! esac
! fi
;;
esac
output_verbose_link_cmd='echo'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
! _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
***************
*** 2685,2690 ****
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--- 2700,2705 ----
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
***************
*** 2712,2716 ****
# overridden to take advantage of the native linker features on
# the platform it is being used on.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
fi
--- 2727,2731 ----
# overridden to take advantage of the native linker features on
# the platform it is being used on.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
fi
***************
*** 2806,2816 ****
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
--- 2821,2831 ----
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
***************
*** 2827,2831 ****
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
--- 2842,2846 ----
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
***************
*** 2844,2853 ****
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
--- 2859,2868 ----
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
***************
*** 2858,2862 ****
cat $export_symbols >> $output_objdir/$soname.def;
fi~
! $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
--- 2873,2877 ----
cat $export_symbols >> $output_objdir/$soname.def;
fi~
! $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
***************
*** 2869,2876 ****
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
*) # Darwin 1.3 on
! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
esac
--- 2884,2902 ----
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
;;
*) # Darwin 1.3 on
! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! else
! case ${MACOSX_DEPLOYMENT_TARGET} in
! 10.[012])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! ;;
! 10.*)
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
! ;;
! esac
! fi
;;
esac
***************
*** 2881,2897 ****
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--- 2907,2923 ----
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
fi
! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
***************
*** 2928,2932 ****
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
! freebsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
--- 2954,2958 ----
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
! freebsd* | kfreebsd*-gnu)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
***************
*** 2950,2954 ****
;;
aCC)
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
--- 2976,2980 ----
;;
aCC)
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
***************
*** 2963,2967 ****
*)
if test "$GXX" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
--- 2989,2993 ----
*)
if test "$GXX" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
***************
*** 3020,3024 ****
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
--- 3046,3050 ----
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
;;
esac
***************
*** 3041,3045 ****
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
--- 3067,3071 ----
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
;;
esac
***************
*** 3056,3060 ****
CC)
# SGI C++
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
--- 3082,3086 ----
CC)
# SGI C++
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
***************
*** 3067,3073 ****
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
--- 3093,3099 ----
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
***************
*** 3086,3091 ****
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
--- 3112,3117 ----
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
***************
*** 3109,3114 ****
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--- 3135,3140 ----
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
***************
*** 3117,3122 ****
cxx)
# Compaq C++
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
--- 3143,3148 ----
cxx)
# Compaq C++
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
***************
*** 3175,3179 ****
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--- 3201,3205 ----
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
***************
*** 3192,3196 ****
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--- 3218,3222 ----
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
***************
*** 3210,3214 ****
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--- 3236,3240 ----
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
***************
*** 3235,3239 ****
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--- 3261,3265 ----
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
! _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
***************
*** 3251,3258 ****
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
! $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
$rm $lib.exp'
--- 3277,3284 ----
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
! $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
$rm $lib.exp'
***************
*** 3273,3277 ****
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--- 3299,3303 ----
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
***************
*** 3330,3336 ****
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--- 3356,3362 ----
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
***************
*** 3366,3370 ****
gcx)
# Green Hills C++ Compiler
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
--- 3392,3396 ----
gcx)
# Green Hills C++ Compiler
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
***************
*** 3376,3382 ****
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
--- 3402,3408 ----
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
***************
*** 3387,3393 ****
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
--- 3413,3419 ----
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
***************
*** 3917,3921 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
--- 3943,3947 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
***************
*** 4574,4578 ****
esac
;;
! freebsd*)
# FreeBSD uses GNU C++
;;
--- 4600,4604 ----
esac
;;
! freebsd* | kfreebsd*-gnu)
# FreeBSD uses GNU C++
;;
***************
*** 5059,5063 ****
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
--- 5085,5089 ----
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
***************
*** 5069,5073 ****
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--- 5095,5099 ----
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
***************
*** 5075,5079 ****
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
--- 5101,5105 ----
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
***************
*** 5084,5088 ****
cat $export_symbols >> $output_objdir/$soname.def;
fi~
! $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
--- 5110,5114 ----
cat $export_symbols >> $output_objdir/$soname.def;
fi~
! $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
***************
*** 5095,5100 ****
wlarc=
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
--- 5121,5126 ----
wlarc=
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
***************
*** 5114,5119 ****
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
--- 5140,5145 ----
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
***************
*** 5130,5135 ****
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
--- 5156,5161 ----
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
***************
*** 5245,5255 ****
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
--- 5271,5281 ----
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
! _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
***************
*** 5266,5270 ****
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
--- 5292,5296 ----
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
***************
*** 5289,5293 ****
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Tell ltmain to make .lib files, not .a files.
libext=lib
--- 5315,5319 ----
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
! _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
# Tell ltmain to make .lib files, not .a files.
libext=lib
***************
*** 5295,5299 ****
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
--- 5321,5325 ----
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
***************
*** 5309,5316 ****
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
*) # Darwin 1.3 on
! test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
esac
--- 5335,5353 ----
case "$host_os" in
rhapsody* | darwin1.[[012]])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
;;
*) # Darwin 1.3 on
! if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! else
! case ${MACOSX_DEPLOYMENT_TARGET} in
! 10.[012])
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
! ;;
! 10.*)
! _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
! ;;
! esac
! fi
;;
esac
***************
*** 5321,5336 ****
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--- 5358,5373 ----
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
fi
! _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
! _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
! _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
***************
*** 5373,5378 ****
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
! freebsd*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
--- 5410,5415 ----
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
! freebsd* | kfreebsd*-gnu)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
***************
*** 5382,5386 ****
hpux9*)
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--- 5419,5423 ----
hpux9*)
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
***************
*** 5400,5407 ****
case "$host_cpu" in
hppa*64*|ia64*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
--- 5437,5444 ----
case "$host_cpu" in
hppa*64*|ia64*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
;;
esac
***************
*** 5450,5454 ****
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--- 5487,5491 ----
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
***************
*** 5483,5487 ****
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--- 5520,5524 ----
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
***************
*** 5493,5497 ****
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
--- 5530,5534 ----
;;
*)
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
***************
*** 5504,5508 ****
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
! _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
--- 5541,5545 ----
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
! _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
***************
*** 5511,5515 ****
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--- 5548,5552 ----
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
***************
*** 5523,5527 ****
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
--- 5560,5564 ----
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
***************
*** 5548,5554 ****
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--- 5585,5591 ----
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
! $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
***************
*** 5570,5574 ****
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--- 5607,5611 ----
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
***************
*** 5630,5636 ****
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
runpath_var='LD_RUN_PATH'
--- 5667,5673 ----
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
else
! _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
fi
runpath_var='LD_RUN_PATH'
Index: missing
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/missing,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** missing 27 Jul 2004 23:05:24 -0000 1.2
--- missing 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 1,5 ****
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
--- 1,9 ----
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
!
! scriptversion=2004-09-07.08
!
! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
! # Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
***************
*** 39,42 ****
--- 43,48 ----
fi
+ msg="missing on your system"
+
case "$1" in
--run)
***************
*** 45,54 ****
shift
"$@" && exit 0
;;
- esac
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
- case "$1" in
-h|--h|--he|--hel|--help)
--- 51,64 ----
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-h|--h|--he|--hel|--help)
***************
*** 75,83 ****
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
! yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing 0.4 - GNU automake"
;;
--- 85,97 ----
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
! yacc create \`y.tab.[ch]', if possible, from existing .[ch]
!
! Send bug reports to <bug-automake at gnu.org>."
! exit 0
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing $scriptversion (GNU Automake)"
! exit 0
;;
***************
*** 88,99 ****
;;
! aclocal*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
--- 102,143 ----
;;
! esac
!
! # Now exit if we have it, but it failed. Also exit now if we
! # don't have it and --version was passed (most likely to detect
! # the program).
! case "$1" in
! lex|yacc)
! # Not GNU programs, they don't have --version.
! ;;
!
! tar)
! if test -n "$run"; then
! echo 1>&2 "ERROR: \`tar' requires --run"
! exit 1
! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
! exit 1
! fi
! ;;
!
! *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+ esac
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+ case "$1" in
+ aclocal*)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
***************
*** 103,113 ****
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
--- 147,152 ----
autoconf)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
***************
*** 117,127 ****
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
--- 156,161 ----
autoheader)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
***************
*** 141,151 ****
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
--- 175,180 ----
automake*)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
***************
*** 157,170 ****
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is needed, and you do not seem to have it handy on your
! system. You might have modified some files without having the
proper tools for further handling them.
! You can get \`$1Help2man' as part of \`Autoconf' from any GNU
archive site."
--- 186,194 ----
autom4te)
echo 1>&2 "\
! WARNING: \`$1' is needed, but is $msg.
! You might have modified some files without having the
proper tools for further handling them.
! You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
***************
*** 186,190 ****
bison|yacc)
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
--- 210,214 ----
bison|yacc)
echo 1>&2 "\
! WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
***************
*** 216,220 ****
lex|flex)
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
--- 240,244 ----
lex|flex)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
***************
*** 238,248 ****
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
--- 262,267 ----
help2man)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
***************
*** 263,273 ****
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
! WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
--- 282,287 ----
makeinfo)
echo 1>&2 "\
! WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
***************
*** 285,292 ****
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
--- 299,302 ----
***************
*** 324,331 ****
*)
echo 1>&2 "\
! WARNING: \`$1' is needed, and you do not seem to have it handy on your
! system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
! it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
--- 334,341 ----
*)
echo 1>&2 "\
! WARNING: \`$1' is needed, and is $msg.
! You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
! it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
***************
*** 335,336 ****
--- 345,353 ----
exit 0
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-end: "$"
+ # End:
--- NEW FILE: acinclude.m4.in.orig ---
## -*- autoconf -*-
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 1997 Janos Farkas (chexum at shadow.banki.hu)
dnl (C) 1997,98,99 Stephan Kulow (coolo at kde.org)
dnl This file is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Library General Public
dnl License as published by the Free Software Foundation; either
dnl version 2 of the License, or (at your option) any later version.
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Library General Public License for more details.
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
[...5930 lines suppressed...]
[kde_has_pie_support=$enableval],
[kde_has_pie_support=detect])
if test "$kde_has_pie_support" = "detect"; then
kde_has_pie_support=$kde_cv_val_pie_support
fi
AC_MSG_RESULT([$kde_has_pie_support])
KDE_USE_FPIE=""
KDE_USE_PIE=""
AC_SUBST([KDE_USE_FPIE])
AC_SUBST([KDE_USE_PIE])
if test "$kde_has_pie_support" = "yes"; then
KDE_USE_FPIE="-fPIE"
KDE_USE_PIE="-pie"
fi
])
Index: am_edit
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/am_edit,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** am_edit 27 Jul 2004 23:05:24 -0000 1.3
--- am_edit 13 Sep 2006 12:16:30 -0000 1.4
***************
*** 52,55 ****
--- 52,56 ----
sub checkMocCandidates ();
sub addMocRules ();
+ sub findKcfgFile($);
sub tag_AUTOMAKE ();
***************
*** 61,64 ****
--- 62,66 ----
sub tag_IDLFILES();
sub tag_UIFILES();
+ sub tag_KCFGFILES();
sub tag_SUBDIRS();
sub tag_ICON();
***************
*** 112,120 ****
$verbose = 1; # Oh is there a problem...?
}
! elsif (/^-p(.+)$|^--path=(.+)$/)
{
! $thisProg = "$1/".basename($thisProg) if($1);
! $thisProg = "$2/".basename($thisProg) if($2);
warn ("$thisProg doesn't exist\n") if (!(-f $thisProg));
$pathoption=1;
}
--- 114,123 ----
$verbose = 1; # Oh is there a problem...?
}
! elsif (/^(?:-p|--path=)(.+)$/)
{
! my $p = $1;
! $thisProg = $p . "/". basename($thisProg);
warn ("$thisProg doesn't exist\n") if (!(-f $thisProg));
+ $thisProg .= " -p".$p;
$pathoption=1;
}
***************
*** 223,230 ****
--- 226,235 ----
local %important = (); # list of files to be generated asap
local %uiFiles = ();
+ local %kcfgFiles = ();
local $allidls = "";
local $idl_output = "";# lists all idl generated files for cleantarget
local $ui_output = "";# lists all uic generated files for cleantarget
+ local $kcfg_output = "";# lists all kcfg generated files for cleantarget
local %dependmocs = ();
***************
*** 264,268 ****
tag_CLOSURE();
tag_NMCHECK();
! tag_UIFILES(); # Sorts out ui rules
tag_METASOURCES (); # Sorts out the moc rules
if ($sources_changed{$program}) {
--- 269,274 ----
tag_CLOSURE();
tag_NMCHECK();
! tag_UIFILES(); # Sorts out ui rules
! tag_KCFGFILES(); # Sorts out kcfg rules
tag_METASOURCES (); # Sorts out the moc rules
if ($sources_changed{$program}) {
***************
*** 271,275 ****
if($program =~ /libkdeinit_(.*)/) {
my $prog = $1;
! substituteLine($prog . '_SOURCES\s*=[ \t]*.*',
"${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" .
"libkdeinit_${prog}_SOURCES = " . $sources{$program});
--- 277,281 ----
if($program =~ /libkdeinit_(.*)/) {
my $prog = $1;
! substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)',
"${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" .
"libkdeinit_${prog}_SOURCES = " . $sources{$program});
***************
*** 321,324 ****
--- 327,335 ----
}
+ if ($kcfg_output) {
+ appendLines ("$cleantarget-kcfg:\n\t-rm -f $kcfg_output\n");
+ $target_adds{"$cleantarget-am"} .= "$cleantarget-kcfg ";
+ }
+
if ($closure_output) {
appendLines ("$cleantarget-closures:\n\t-rm -f $closure_output\n");
***************
*** 341,345 ****
$tmp .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
appendLines($tmp);
!
make_bcheck_target();
make_meta_classes();
--- 352,356 ----
$tmp .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
appendLines($tmp);
!
make_bcheck_target();
make_meta_classes();
***************
*** 412,419 ****
}
- my $cvs_lines = "cvs-clean:\n";
- $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
- appendLines($cvs_lines);
-
$cvs_lines = "kde-rpo-clean:\n";
$cvs_lines .= "\t-rm -f *.rpo\n";
--- 423,426 ----
***************
*** 473,476 ****
--- 480,484 ----
$lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
$replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
substituteLine($lookup, $replacement);
} else {
***************
*** 528,533 ****
# Checking for files to process...
! open (FILEIN, $makefile)
! || die "Could not open $makefileDir/$makefile: $!\n";
# Read the file
# stat(FILEIN)[7] might look more elegant, but is slower as it
--- 536,543 ----
# Checking for files to process...
!
! open (FILEIN, $makefile) || die "Can't open $makefileDir/$makefile: $!\n";
! # perl bug in 5.8.0: in utf8 mode it badly screws up
! binmode(FILEIN, ":bytes") if ($] >= 5.008);
# Read the file
# stat(FILEIN)[7] might look more elegant, but is slower as it
***************
*** 622,626 ****
my @addlist = split(/[\034\s]+/, $varcontent{$variable});
push(@objlist, @addlist);
! } elsif ($variable !~ 'OBJEXT') {
$ocv = 1;
}
--- 632,636 ----
my @addlist = split(/[\034\s]+/, $varcontent{$variable});
push(@objlist, @addlist);
! } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
$ocv = 1;
}
***************
*** 735,738 ****
--- 745,749 ----
@shash{@progsources} = 1; # we are only interested in the existence
my %sourcelist = ();
+ my %extradeps = ();
foreach $source (@progsources) {
***************
*** 752,757 ****
}
}
foreach $suffix (keys %sourcelist) {
-
# See if this file contains c++ code. (i.e., just check the file's suffix against c++ extensions)
my $suffix_is_cxx = 0;
--- 763,773 ----
}
}
+
+ # scan for extra given dependencies and add them to our target
+ while ($MakefileData =~ /\n\s*(\S+)\.(?:lo|o)\s*:([^\n]*)/g) {
+ $extradeps{$1} = $2;
+ }
+
foreach $suffix (keys %sourcelist) {
# See if this file contains c++ code. (i.e., just check the file's suffix against c++ extensions)
my $suffix_is_cxx = 0;
***************
*** 770,774 ****
if ($suffix eq "skel" || $suffix =~ /^stub/
|| $suffix =~ /^signals/ # obsolete, remove in KDE-4
! || $suffix eq "h" || $suffix eq "ui" ) {
next;
}
--- 786,791 ----
if ($suffix eq "skel" || $suffix =~ /^stub/
|| $suffix =~ /^signals/ # obsolete, remove in KDE-4
! || $suffix eq "h" || $suffix eq "ui"
! || $suffix eq "kcfgc" ) {
next;
}
***************
*** 794,797 ****
--- 811,817 ----
$source_deps .= " $source";
}
+ my $plainsource = $source;
+ $plainsource =~ s/\.$cppExt$//;
+ $source_deps .= " " . $extradeps{$plainsource} if (exists($extradeps{$plainsource}));
}
***************
*** 853,857 ****
$lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
! $lines .= "\t echo > ${kdeinit}_dummy.$cxxsuffix\n";
push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
--- 873,879 ----
$lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
! $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
! $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n";
! $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
***************
*** 869,873 ****
appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n");
}
! appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = \$(all_libraries)\n");
# add library dependencies
--- 891,895 ----
appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n");
}
! appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n");
# add library dependencies
***************
*** 945,949 ****
$sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix";
! $lines .= "${kdeinit}_LDFLAGS = \$(all_libraries)\n";
$lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n";
$lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n";
--- 967,971 ----
$sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix";
! $lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n";
$lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n";
$lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n";
***************
*** 973,977 ****
if($#progs >= 0) {
if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) {
! print STDERR "Error: bin_PROGRAMS missing in $printname (required for bin_PROGRAMS).\n";
$errorflag = 1;
}
--- 995,999 ----
if($#progs >= 0) {
if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) {
! print STDERR "Error: bin_PROGRAMS missing in $printname (required for kdeinit_LTLIBRARIES).\n";
$errorflag = 1;
}
***************
*** 1027,1031 ****
push @deps, $depend;
}
! $target_adds{$sdeps} = join(' ', @deps) if (@deps);
$donesources{$source} = 1;
}
--- 1049,1053 ----
push @deps, $depend;
}
! $target_adds{$sdeps} .= join(' ', @deps) . ' ' if (@deps);
$donesources{$source} = 1;
}
***************
*** 1124,1127 ****
--- 1146,1152 ----
my $newLine = $1."\n\tcd \$(top_srcdir) && perl $thisProg $printname";
+
+ # automake 1.8.x adds another automake call. *sigh*
+ $newLine =~ s/;([\034\s]+cd\s+\$\(srcdir\)\s+&&[\034\s]+\$\(AUTOMAKE\).*)[\034\s]+\&\&[\034\s]+exit[\034\s]+0;([\034\s]+exit\s+1)/; \034 ( $1 ) || exit 1; echo \' cd \$(top_srcdir) && perl $thisProg \'; cd \$(top_srcdir) && perl $thisProg && exit 0; $2/;
substituteLine ($lookup, $newLine);
$automkCall = $1;
***************
*** 1129,1133 ****
$lookup = '.*cd \$\(srcdir\)\s+&&[\034\s]+\$\(AUTOCONF\)(.*)';
if ($MakefileData =~ /\n($lookup)\n/) {
! $newLine = "\tcd \$(srcdir) && rm -f configure && \$(MAKE) -f admin/Makefile.common configure";
substituteLine ($lookup, $newLine);
}
--- 1154,1159 ----
$lookup = '.*cd \$\(srcdir\)\s+&&[\034\s]+\$\(AUTOCONF\)(.*)';
if ($MakefileData =~ /\n($lookup)\n/) {
! $newLine = "\tcd \$(srcdir) && rm -f configure\n";
! $newLine .= "\tcd \$(top_srcdir) && \$(MAKE) -f admin/Makefile.common configure";
substituteLine ($lookup, $newLine);
}
***************
*** 1237,1242 ****
if ($allidls !~ /$source\_kidl/) {
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
! $dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
$allidls .= $source . "_kidl ";
--- 1263,1271 ----
if ($allidls !~ /$source\_kidl/) {
+ $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
+ $dcopidl = $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(DCOPIDLNG)" : "\$(DCOPIDL)";
+
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
! $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
$allidls .= $source . "_kidl ";
***************
*** 1333,1341 ****
$dep_lines .= "\trm -f $source.$cxxsuffix\n";
if (!$kdeopts{"qtonly"}) {
! $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n";
my ($mangled_source) = $source;
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
! $dep_lines .= "\tsed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
} else {
--- 1362,1371 ----
$dep_lines .= "\trm -f $source.$cxxsuffix\n";
if (!$kdeopts{"qtonly"}) {
! $dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
! $dep_lines .= "\techo '#include <klocale.h>' >> $source.$cxxsuffix\n";
my ($mangled_source) = $source;
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
! $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: QWizard\\(,: KWizard(,g\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
} else {
***************
*** 1344,1348 ****
$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
! $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n\n";
$dep_lines .= "$source.moc: $source.h\n";
$dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
--- 1374,1383 ----
$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
! $dep_lines .= "\trm -rf $source.h;\n";
! if (!$kdeopts{"qtonly"}) {
! $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
! } else {
! $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
! }
$dep_lines .= "$source.moc: $source.h\n";
$dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
***************
*** 1365,1369 ****
$ui_output .= "\\\n\t$source.$cxxsuffix $source.h $source.moc ";
push(@cleanfiles, "$source.$cxxsuffix");
! push(@cleanfiles, "source.h");
push(@cleanfiles, "$source.moc");
$dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
--- 1400,1404 ----
$ui_output .= "\\\n\t$source.$cxxsuffix $source.h $source.moc ";
push(@cleanfiles, "$source.$cxxsuffix");
! push(@cleanfiles, "$source.h");
push(@cleanfiles, "$source.moc");
$dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
***************
*** 1372,1375 ****
--- 1407,1466 ----
}
+ sub tag_KCFGFILES ()
+ {
+ my @psources = split(/[\034\s]+/, $sources{$program});
+ my @depFiles = ();
+
+ foreach $source (@psources) {
+
+ if ($source =~ m/\.kcfgc$/) {
+
+ print STDERR "adding KCFG file $source\n" if ($verbose);
+
+ my $qs = quotemeta($source);
+ $sources{$program} =~ s/$qs//;
+ $sources_changed{$program} = 1;
+
+ $source =~ s/\.kcfgc$//;
+
+ my $sourcedir = '';
+ if (-f "$makefileDir/$source.kcfgc") {
+ $sourcedir = '$(srcdir)/';
+ }
+
+ if (!$kcfgFiles{$source}) {
+ $kcfg = "$program.kcfg";
+ findKcfgFile("$source.kcfgc");
+
+ my $fixsuffix = "";
+ $fixsuffix = "else mv $source.cpp $source.$cxxsuffix ; "
+ unless "cpp" eq $cxxsuffix;
+
+ my $dep_lines = "$source.$cxxsuffix: $source.h\n";
+ $dep_lines .= "$source.h: $sourcedir$kcfg $sourcedir$source.kcfgc \$(KCFG_DEPENDENCIES)\n";
+ $dep_lines .= "\t\$(KCONFIG_COMPILER) $sourcedir$kcfg $sourcedir$source.kcfgc; ret=\$\$?; \\\n";
+ $dep_lines .= "\tif test \"\$\$ret\" != 0; then rm -f $source.h ; exit \$\$ret ; $fixsuffix fi\n\n";
+
+ $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
+
+ $kcfgFiles{$source} = 1;
+ }
+
+ if ($program =~ /_la$/) {
+ $realObjs{$program} .= " $source.lo";
+ } else {
+ $realObjs{$program} .= " $source.\$(OBJEXT)";
+ }
+ $sources{$program} .= " $source.$cxxsuffix";
+ $sources_changed{$program} = 1;
+ $important{$program} .= "$source.h ";
+ $kcfg_output .= "\\\n\t$source.$cxxsuffix $source.h ";
+ push(@cleanfiles, "$source.$cxxsuffix");
+ push(@cleanfiles, "$source.h");
+ $dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
+ }
+ }
+ }
+
sub tag_ICON()
{
***************
*** 1612,1616 ****
if (!$lang) {
! appendLines("merge:\n\t\$(MAKE) -C \$(top_srcdir)/po -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n");
}
--- 1703,1707 ----
if (!$lang) {
! appendLines("merge:\n\t\$(MAKE) -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n");
}
***************
*** 1645,1649 ****
closedir (THISDIR);
print STDOUT "pofiles found = $pofiles\n" if ($verbose);
! if (-f "charset" && -f "kdelibs.po") {
handle_TOPLEVEL();
}
--- 1736,1740 ----
closedir (THISDIR);
print STDOUT "pofiles found = $pofiles\n" if ($verbose);
! if (-f "charset" && -f "kdelibs/kdelibs.po") {
handle_TOPLEVEL();
}
***************
*** 1938,1942 ****
$lines .= "\n";
$lines .= "uninstall-docs:\n";
! $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
$lines .= "\n";
$lines .= "clean-docs:\n";
--- 2029,2033 ----
$lines .= "\n";
$lines .= "uninstall-docs:\n";
! $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
$lines .= "\n";
$lines .= "clean-docs:\n";
***************
*** 2187,2193 ****
"\t if ! ";
$t .= $cxxsuffix eq "KKK" ?
! "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
"\$(CXXCOMPILE) ";
! $t .= " --dump-class-hierarchy \$\$i.bchecktest.cc; then \\\n" .
"\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
"\t fi ; \\\n" .
--- 2278,2284 ----
"\t if ! ";
$t .= $cxxsuffix eq "KKK" ?
! "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
"\$(CXXCOMPILE) ";
! $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
"\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
"\t fi ; \\\n" .
***************
*** 2338,2339 ****
--- 2429,2445 ----
#-----------------------------------------------------------------------------
+
+ # find the .kcfg file listed in the .kcfgc file
+ sub findKcfgFile($)
+ {
+ my ($kcfgf) = @_;
+ open (KCFGFIN, $kcfgf) || die "Could not open $kcfgf: $!\n";
+ seek(KCFGFIN, 0, 2);
+ my $kcfgfsize = tell(KCFGFIN);
+ seek(KCFGFIN, 0, 0);
+ read KCFGFIN, $kcfgfData, $kcfgfsize;
+ close KCFGFIN;
+ if(($kcfgfData =~ m/^File=(.*\.kcfg)/gm)) {
+ $kcfg = $1;
+ }
+ }
Index: ylwrap
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/ylwrap,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ylwrap 1 Nov 2002 01:10:09 -0000 1.1.1.1
--- ylwrap 13 Sep 2006 12:16:30 -0000 1.2
***************
*** 1,5 ****
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
! # Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
--- 1,10 ----
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
!
! scriptversion=2005-05-14.22
!
! # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
! # Free Software Foundation, Inc.
! #
# Written by Tom Tromey <tromey at cygnus.com>.
#
***************
*** 16,20 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 21,26 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
! # 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 23,34 ****
# the same distribution terms that you use for the rest of that program.
! # Usage:
! # ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
! # * INPUT is the input file
! # * OUTPUT is file PROG generates
! # * DESIRED is file we actually want
! # * PROGRAM is program to run
! # * ARGS are passed to PROG
! # Any number of OUTPUT,DESIRED pairs may be used.
# The input.
--- 29,69 ----
# the same distribution terms that you use for the rest of that program.
! # This file is maintained in Automake, please report
! # bugs to <bug-automake at gnu.org> or send patches to
! # <automake-patches at gnu.org>.
!
! case "$1" in
! '')
! echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
! exit 1
! ;;
! --basedir)
! basedir=$2
! shift 2
! ;;
! -h|--h*)
! cat <<\EOF
! Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
!
! Wrapper for lex/yacc invocations, renaming files as desired.
!
! INPUT is the input file
! OUTPUT is one file PROG generates
! DESIRED is the file we actually want instead of OUTPUT
! PROGRAM is program to run
! ARGS are passed to PROG
!
! Any number of OUTPUT,DESIRED pairs may be used.
!
! Report bugs to <bug-automake at gnu.org>.
! EOF
! exit $?
! ;;
! -v|--v*)
! echo "ylwrap $scriptversion"
! exit $?
! ;;
! esac
!
# The input.
***************
*** 36,43 ****
shift
case "$input" in
! [\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
! *)
# Relative path. Make it absolute.
input="`pwd`/$input"
--- 71,78 ----
shift
case "$input" in
! [\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
! *)
# Relative path. Make it absolute.
input="`pwd`/$input"
***************
*** 45,64 ****
esac
- # The directory holding the input.
- input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
- # Quote $INPUT_DIR so we can use it in a regexp.
- # FIXME: really we should care about more than `.' and `\'.
- input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
-
- echo "got $input_rx"
-
pairlist=
while test "$#" -ne 0; do
! if test "$1" = "--"; then
! shift
! break
! fi
! pairlist="$pairlist $1"
! shift
done
--- 80,91 ----
esac
pairlist=
while test "$#" -ne 0; do
! if test "$1" = "--"; then
! shift
! break
! fi
! pairlist="$pairlist $1"
! shift
done
***************
*** 68,73 ****
# Make any relative path in $prog absolute.
case "$prog" in
! [\\/]* | ?:[\\/]*) ;;
! *[\\/]*) prog="`pwd`/$prog" ;;
esac
--- 95,100 ----
# Make any relative path in $prog absolute.
case "$prog" in
! [\\/]* | ?:[\\/]*) ;;
! *[\\/]*) prog="`pwd`/$prog" ;;
esac
***************
*** 80,138 ****
cd $dirname
! $prog ${1+"$@"} "$input"
! status=$?
! if test $status -eq 0; then
! set X $pairlist
! shift
! first=yes
! # Since DOS filename conventions don't allow two dots,
! # the DOS version of Bison writes out y_tab.c instead of y.tab.c
! # and y_tab.h instead of y.tab.h. Test to see if this is the case.
! y_tab_nodot="no"
! if test -f y_tab.c || test -f y_tab.h; then
! y_tab_nodot="yes"
! fi
! while test "$#" -ne 0; do
! from="$1"
! # Handle y_tab.c and y_tab.h output by DOS
! if test $y_tab_nodot = "yes"; then
! if test $from = "y.tab.c"; then
! from="y_tab.c"
! else
! if test $from = "y.tab.h"; then
! from="y_tab.h"
! fi
! fi
! fi
! if test -f "$from"; then
! # If $2 is an absolute path name, then just use that,
! # otherwise prepend `../'.
! case "$2" in
! [\\/]* | ?:[\\/]*) target="$2";;
! *) target="../$2";;
! esac
! # Edit out `#line' or `#' directives. We don't want the
! # resulting debug information to point at an absolute srcdir;
! # it is better for it to just mention the .y file with no
! # path.
! sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
else
! # A missing file is only an error for the first file. This
! # is a blatant hack to let us support using "yacc -d". If -d
! # is not specified, we don't want an error when the header
! # file is "missing".
! if test $first = yes; then
! status=1
! fi
fi
! shift
! shift
! first=no
! done
else
! status=$?
fi
--- 107,209 ----
cd $dirname
! case $# in
! 0) $prog "$input" ;;
! *) $prog "$@" "$input" ;;
! esac
! ret=$?
! if test $ret -eq 0; then
! set X $pairlist
! shift
! first=yes
! # Since DOS filename conventions don't allow two dots,
! # the DOS version of Bison writes out y_tab.c instead of y.tab.c
! # and y_tab.h instead of y.tab.h. Test to see if this is the case.
! y_tab_nodot="no"
! if test -f y_tab.c || test -f y_tab.h; then
! y_tab_nodot="yes"
! fi
! # The directory holding the input.
! input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
! # Quote $INPUT_DIR so we can use it in a regexp.
! # FIXME: really we should care about more than `.' and `\'.
! input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
! while test "$#" -ne 0; do
! from="$1"
! # Handle y_tab.c and y_tab.h output by DOS
! if test $y_tab_nodot = "yes"; then
! if test $from = "y.tab.c"; then
! from="y_tab.c"
else
! if test $from = "y.tab.h"; then
! from="y_tab.h"
! fi
fi
! fi
! if test -f "$from"; then
! # If $2 is an absolute path name, then just use that,
! # otherwise prepend `../'.
! case "$2" in
! [\\/]* | ?:[\\/]*) target="$2";;
! *) target="../$2";;
! esac
!
! # We do not want to overwrite a header file if it hasn't
! # changed. This avoid useless recompilations. However the
! # parser itself (the first file) should always be updated,
! # because it is the destination of the .y.c rule in the
! # Makefile. Divert the output of all other files to a temporary
! # file so we can compare them to existing versions.
! if test $first = no; then
! realtarget="$target"
! target="tmp-`echo $target | sed s/.*[\\/]//g`"
! fi
! # Edit out `#line' or `#' directives.
! #
! # We don't want the resulting debug information to point at
! # an absolute srcdir; it is better for it to just mention the
! # .y file with no path.
! #
! # We want to use the real output file name, not yy.lex.c for
! # instance.
! #
! # We want the include guards to be adjusted too.
! FROM=`echo "$from" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
! TARGET=`echo "$2" | sed \
! -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
! -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
!
! sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
! -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
!
! # Check whether header files must be updated.
! if test $first = no; then
! if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
! echo "$2" is unchanged
! rm -f "$target"
! else
! echo updating "$2"
! mv -f "$target" "$realtarget"
! fi
! fi
! else
! # A missing file is only an error for the first file. This
! # is a blatant hack to let us support using "yacc -d". If -d
! # is not specified, we don't want an error when the header
! # file is "missing".
! if test $first = yes; then
! ret=1
! fi
! fi
! shift
! shift
! first=no
! done
else
! ret=$?
fi
***************
*** 141,143 ****
rm -rf $dirname
! exit $status
--- 212,223 ----
rm -rf $dirname
! exit $ret
!
! # Local Variables:
! # mode: shell-script
! # sh-indentation: 2
! # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "scriptversion="
! # time-stamp-format: "%:y-%02m-%02d.%02H"
! # time-stamp-end: "$"
! # End:
Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/acinclude.m4.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** acinclude.m4.in 17 May 2006 12:36:14 -0000 1.14
--- acinclude.m4.in 13 Sep 2006 12:16:30 -0000 1.15
***************
*** 17,22 ****
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! dnl Boston, MA 02111-1307, USA.
dnl IMPORTANT NOTE:
--- 17,22 ----
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
[...1827 lines suppressed...]
+ [kde_has_pie_support=$enableval],
+ [kde_has_pie_support=detect])
+
+ if test "$kde_has_pie_support" = "detect"; then
+ kde_has_pie_support=$kde_cv_val_pie_support
+ fi
+
+ AC_MSG_RESULT([$kde_has_pie_support])
+
+ KDE_USE_FPIE=""
+ KDE_USE_PIE=""
+
+ AC_SUBST([KDE_USE_FPIE])
+ AC_SUBST([KDE_USE_PIE])
+
+ if test "$kde_has_pie_support" = "yes"; then
+ KDE_USE_FPIE="-fPIE"
+ KDE_USE_PIE="-pie"
+ fi
+ ])
Index: configure.in.bot.end
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/configure.in.bot.end,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.in.bot.end 27 Jul 2004 23:05:24 -0000 1.1
--- configure.in.bot.end 13 Sep 2006 12:16:30 -0000 1.2
***************
*** 1,5 ****
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
! echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
--- 1,38 ----
+ # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
+ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
+ # And if so, warn when they don't match
+ if test "$kde_libs_prefix" != "$given_prefix"; then
+ # And if kde doesn't know about the prefix yet
+ echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+ if test $? -ne 0; then
+ echo ""
+ echo "Warning: you chose to install this package in $given_prefix,"
+ echo "but KDE was found in $kde_libs_prefix."
+ echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
+ echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+ echo "Then restart KDE."
+ echo ""
+ fi
+ fi
+ fi
+
+ if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
+ echo ""
+ echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
+ echo "was not included. Therefore, GCC symbol visibility support remains disabled."
+ echo ""
+ echo "For better performance, consider including the Qt visibility supporting patch"
+ echo "located at:"
+ echo ""
+ echo "http://bugs.kde.org/show_bug.cgi?id=109386"
+ echo ""
+ echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
+ echo "everything will continue to work just fine without it."
+ echo ""
+ fi
+
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
! echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
Index: ltmain.sh
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/ltmain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ltmain.sh 27 Jul 2004 23:05:24 -0000 1.2
--- ltmain.sh 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 18,22 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
--- 18,22 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
***************
*** 1150,1153 ****
--- 1150,1166 ----
continue
;;
+ framework)
+ case $host in
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ ;;
+ esac
+ ;;
+ esac
+ prev=
+ continue
+ ;;
*)
eval "$prev=\"\$arg\""
***************
*** 1264,1270 ****
continue
;;
- *-*-freebsd*-gnu*)
- # prevent being parsed by the freebsd regexp below
- ;;
*-*-mingw* | *-*-os2*)
# These systems don't actually have a C library (as such)
--- 1277,1280 ----
***************
*** 1277,1288 ****
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
! deplibs="$deplibs -framework System"
continue
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-freebsd*-gnu*)
- # prevent being parsed by the freebsd regexp below
- ;;
*-*-openbsd*)
# Do not include libc_r directly, use -pthread flag.
--- 1287,1295 ----
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
! deplibs="$deplibs System.ltframework"
continue
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
*-*-openbsd*)
# Do not include libc_r directly, use -pthread flag.
***************
*** 1467,1470 ****
--- 1474,1482 ----
;;
+ -framework)
+ prev=framework
+ continue
+ ;;
+
# Some other compiler flag.
-* | +*)
***************
*** 1884,1887 ****
--- 1896,1911 ----
fi
;; # -l
+ *.ltframework)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ if test "$linkmode" = lib ; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ fi
+ continue
+ ;;
-L*)
case $linkmode in
***************
*** 2012,2015 ****
--- 2036,2046 ----
esac
+ case $host in
+ *-*-darwin*)
+ # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+ test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ ;;
+ esac
+
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
***************
*** 2618,2621 ****
--- 2649,2661 ----
esac
;;
+
+ *.ltframework)
+ case $host in
+ *-*-darwin*)
+ depdepl="$deplib"
+ ;;
+ esac
+ ;;
+
*) continue ;;
esac
***************
*** 3059,3063 ****
for p in $tempremovelist; do
case $p in
! *.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
--- 3099,3103 ----
for p in $tempremovelist; do
case $p in
! *.$objext | *$exeext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
***************
*** 3131,3145 ****
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
! deplibs="$deplibs -framework System"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-freebsd*-gnu*)
- # Prevent $arg from being parsed by the freebsd regexp below.
- if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
- fi
- ;;
*-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
--- 3171,3179 ----
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
! deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
*-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
***************
*** 3430,3434 ****
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
;;
esac
--- 3464,3468 ----
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
***************
*** 3476,3479 ****
--- 3510,3520 ----
fi
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
# Done checking deplibs!
deplibs=$newdeplibs
***************
*** 4058,4068 ****
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
! finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
;;
esac
case $host in
! *darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
if test "$tagname" = CXX ; then
--- 4099,4109 ----
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
! finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
case $host in
! *-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
if test "$tagname" = CXX ; then
***************
*** 4070,4073 ****
--- 4111,4117 ----
finalize_command="$finalize_command ${wl}-bind_at_load"
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
***************
*** 4530,4535 ****
esac
case $host in
! *cygwin* | *mingw* )
! cwrappersource=`$echo ${objdir}/lt-${output}.c`
cwrapper=`$echo ${output}.exe`
$rm $cwrappersource $cwrapper
--- 4574,4579 ----
esac
case $host in
! *mingw* )
! cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
cwrapper=`$echo ${output}.exe`
$rm $cwrappersource $cwrapper
***************
*** 4898,4903 ****
*)
$echo >> $output "\
! exec \$progdir/\$program \${1+\"\$@\"}
"
;;
--- 4942,4949 ----
*)
+ # Need to set LD_LIBRARY_PATH, to the value already
+ # computed within libtool.
$echo >> $output "\
! LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
"
;;
***************
*** 5624,5628 ****
test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$"
! if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
--- 5670,5674 ----
test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$"
! if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
Index: compile
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/compile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compile 27 Jul 2004 23:05:24 -0000 1.1
--- compile 13 Sep 2006 12:16:30 -0000 1.2
***************
*** 1,7 ****
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
! # Copyright 1999, 2000 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
--- 1,8 ----
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
! scriptversion=2005-05-14.22
!
! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
***************
*** 18,22 ****
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
--- 19,23 ----
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
***************
*** 25,76 ****
# the same distribution terms that you use for the rest of that program.
! # Usage:
! # compile PROGRAM [ARGS]...
! # `-o FOO.o' is removed from the args passed to the actual compile.
! prog=$1
! shift
ofile=
cfile=
! args=
! while test $# -gt 0; do
! case "$1" in
! -o)
! # configure might choose to run compile as `compile cc -o foo foo.c'.
! # So we do something ugly here.
! ofile=$2
! shift
! case "$ofile" in
! *.o | *.obj)
! ;;
! *)
! args="$args -o $ofile"
! ofile=
! ;;
! esac
! ;;
! *.c)
! cfile=$1
! args="$args $1"
! ;;
! *)
! args="$args $1"
! ;;
! esac
! shift
done
if test -z "$ofile" || test -z "$cfile"; then
! # If no `-o' option was seen then we might have been invoked from a
! # pattern rule where we don't need one. That is ok -- this is a
! # normal compilation that the losing compiler can handle. If no
! # `.c' file was seen then we are probably linking. That is also
! # ok.
! exec "$prog" $args
fi
# Name of file we expect compiler to create.
! cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
--- 26,108 ----
# the same distribution terms that you use for the rest of that program.
! # This file is maintained in Automake, please report
! # bugs to <bug-automake at gnu.org> or send patches to
! # <automake-patches at gnu.org>.
! case $1 in
! '')
! echo "$0: No command. Try \`$0 --help' for more information." 1>&2
! exit 1;
! ;;
! -h | --h*)
! cat <<\EOF
! Usage: compile [--help] [--version] PROGRAM [ARGS]
!
! Wrapper for compilers which do not understand `-c -o'.
! Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
! arguments, and rename the output as expected.
!
! If you are trying to build a whole package this is not the
! right script to run: please start by reading the file `INSTALL'.
!
! Report bugs to <bug-automake at gnu.org>.
! EOF
! exit $?
! ;;
! -v | --v*)
! echo "compile $scriptversion"
! exit $?
! ;;
! esac
ofile=
cfile=
! eat=
!
! for arg
! do
! if test -n "$eat"; then
! eat=
! else
! case $1 in
! -o)
! # configure might choose to run compile as `compile cc -o foo foo.c'.
! # So we strip `-o arg' only if arg is an object.
! eat=1
! case $2 in
! *.o | *.obj)
! ofile=$2
! ;;
! *)
! set x "$@" -o "$2"
! shift
! ;;
! esac
! ;;
! *.c)
! cfile=$1
! set x "$@" "$1"
! shift
! ;;
! *)
! set x "$@" "$1"
! shift
! ;;
! esac
! fi
! shift
done
if test -z "$ofile" || test -z "$cfile"; then
! # If no `-o' option was seen then we might have been invoked from a
! # pattern rule where we don't need one. That is ok -- this is a
! # normal compilation that the losing compiler can handle. If no
! # `.c' file was seen then we are probably linking. That is also
! # ok.
! exec "$@"
fi
# Name of file we expect compiler to create.
! cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
***************
*** 78,99 ****
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
! lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
while true; do
! if mkdir $lockdir > /dev/null 2>&1; then
! break
! fi
! sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
! trap "rmdir $lockdir; exit 1" 1 2 15
# Run the compile.
! "$prog" $args
! status=$?
if test -f "$cofile"; then
! mv "$cofile" "$ofile"
fi
! rmdir $lockdir
! exit $status
--- 110,142 ----
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
! lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
! if mkdir "$lockdir" >/dev/null 2>&1; then
! break
! fi
! sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
! trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
! "$@"
! ret=$?
if test -f "$cofile"; then
! mv "$cofile" "$ofile"
! elif test -f "${cofile}bj"; then
! mv "${cofile}bj" "$ofile"
fi
! rmdir "$lockdir"
! exit $ret
!
! # Local Variables:
! # mode: shell-script
! # sh-indentation: 2
! # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "scriptversion="
! # time-stamp-format: "%:y-%02m-%02d.%02H"
! # time-stamp-end: "$"
! # End:
--- NEW FILE: pkg.m4.in ---
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
Index: install-sh
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/install-sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install-sh 27 Jul 2004 23:05:24 -0000 1.2
--- install-sh 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 1,18 ****
#!/bin/sh
- #
# install - install a program, script, or datafile
! # This comes from X11R5 (mit/util/scripts/install.sh).
#
! # Copyright 1991 by the Massachusetts Institute of Technology
#
! # Permission to use, copy, modify, distribute, and sell this software and its
! # documentation for any purpose is hereby granted without fee, provided that
! # the above copyright notice appear in all copies and that both that
! # copyright notice and this permission notice appear in supporting
! # documentation, and that the name of M.I.T. not be used in advertising or
! # publicity pertaining to distribution of the software without specific,
! # written prior permission. M.I.T. makes no representations about the
! # suitability of this software for any purpose. It is provided "as is"
! # without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
--- 1,37 ----
#!/bin/sh
# install - install a program, script, or datafile
!
! scriptversion=2005-11-07.23
!
! # This originates from X11R5 (mit/util/scripts/install.sh), which was
! # later released in X11R6 (xc/config/util/install.sh) with the
! # following copyright and license.
#
! # Copyright (C) 1994 X Consortium
#
! # Permission is hereby granted, free of charge, to any person obtaining a copy
! # of this software and associated documentation files (the "Software"), to
! # deal in the Software without restriction, including without limitation the
! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
! # sell copies of the Software, and to permit persons to whom the Software is
! # furnished to do so, subject to the following conditions:
! #
! # The above copyright notice and this permission notice shall be included in
! # all copies or substantial portions of the Software.
! #
! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
! #
! # Except as contained in this notice, the name of the X Consortium shall not
! # be used in advertising or otherwise to promote the sale, use or other deal-
! # ings in this Software without prior written authorization from the X Consor-
! # tium.
! #
! #
! # FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
***************
*** 24,28 ****
# shared with many OS's install programs.
-
# set DOITPROG to echo to test this script
--- 43,46 ----
***************
*** 30,34 ****
doit="${DOITPROG-}"
-
# put in absolute paths if you don't have them in your path; or use env. vars.
--- 48,51 ----
***************
*** 42,276 ****
mkdirprog="${MKDIRPROG-mkdir}"
! transformbasename=""
! transform_arg=""
! instcmd="$mvprog"
! chmodcmd="$chmodprog 0755"
! chowncmd=""
! chgrpcmd=""
! stripcmd=""
! rmcmd="$rmprog -f"
! mvcmd="$mvprog"
! src=""
! dst=""
! dir_arg=""
! while [ x"$1" != x ]; do
! case $1 in
! -c) instcmd=$cpprog
! shift
! continue;;
! -d) dir_arg=true
! shift
! continue;;
! -m) chmodcmd="$chmodprog $2"
! shift
! shift
! continue;;
! -o) chowncmd="$chownprog $2"
! shift
! shift
! continue;;
! -g) chgrpcmd="$chgrpprog $2"
! shift
! shift
! continue;;
! -s) stripcmd=$stripprog
! shift
! continue;;
! -t=*) transformarg=`echo $1 | sed 's/-t=//'`
! shift
! continue;;
! -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
! shift
! continue;;
! *) if [ x"$src" = x ]
! then
! src=$1
! else
! # this colon is to work around a 386BSD /bin/sh bug
! :
! dst=$1
! fi
! shift
! continue;;
! esac
! done
! if [ x"$src" = x ]
! then
! echo "$0: no input file specified" >&2
! exit 1
! else
! :
! fi
! if [ x"$dir_arg" != x ]; then
! dst=$src
! src=""
! if [ -d "$dst" ]; then
! instcmd=:
! chmodcmd=""
! else
! instcmd=$mkdirprog
! fi
! else
! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
! # if $src (and thus $dsttmp) contains '*'.
! if [ -f "$src" ] || [ -d "$src" ]
! then
! :
! else
! echo "$0: $src does not exist" >&2
! exit 1
! fi
! if [ x"$dst" = x ]
! then
! echo "$0: no destination specified" >&2
! exit 1
! else
! :
! fi
! # If destination is a directory, append the input filename; if your system
! # does not like double slashes in filenames, you may need to add some logic
! if [ -d "$dst" ]
! then
! dst=$dst/`basename "$src"`
! else
! :
! fi
! fi
! ## this sed command emulates the dirname command
! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
! # Make sure that the destination directory exists.
! # this part is taken from Noah Friedman's mkinstalldirs script
! # Skip lots of stat calls in the usual case.
! if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
! IFS="${IFS-$defaultIFS}"
! oIFS=$IFS
! # Some sh's can't handle IFS=/ for some reason.
! IFS='%'
! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
! IFS=$oIFS
! pathcomp=''
! while [ $# -ne 0 ] ; do
! pathcomp=$pathcomp$1
! shift
! if [ ! -d "$pathcomp" ] ;
! then
! $mkdirprog "$pathcomp"
! else
! :
! fi
! pathcomp=$pathcomp/
! done
! fi
! if [ x"$dir_arg" != x ]
! then
! $doit $instcmd "$dst" &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
! else
! # If we're going to rename the final executable, determine the name now.
! if [ x"$transformarg" = x ]
! then
! dstfile=`basename "$dst"`
else
! dstfile=`basename "$dst" $transformbasename |
! sed $transformarg`$transformbasename
! fi
! # don't allow the sed command to completely eliminate the filename
! if [ x"$dstfile" = x ]
! then
! dstfile=`basename "$dst"`
else
! :
fi
! # Make a couple of temp file names in the proper directory.
! dsttmp=$dstdir/#inst.$$#
! rmtmp=$dstdir/#rm.$$#
! # Trap to clean up temp files at exit.
! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
! trap '(exit $?); exit' 1 2 13 15
! # Move or copy the file name to the temp name
! $doit $instcmd "$src" "$dsttmp" &&
! # and set any options; do chmod last to preserve setuid bits
! # If any of these fail, we abort the whole thing. If we want to
! # ignore errors from any of these, just make sure not to ignore
! # errors from the above "$doit $instcmd $src $dsttmp" command.
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
! # Now remove or move aside any old file at destination location. We try this
! # two ways since rm can't unlink itself on some systems and the destination
! # file might be busy for other reasons. In this case, the final cleanup
! # might fail but the new file should still install successfully.
! {
! if [ -f "$dstdir/$dstfile" ]
! then
! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
! $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
! {
! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
! (exit 1); exit
! }
! else
! :
! fi
! } &&
! # Now rename the file to the real destination.
! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
! fi &&
! # The final little trick to "correctly" pass the exit status to the exit trap.
! {
! (exit 0); exit
! }
--- 59,401 ----
mkdirprog="${MKDIRPROG-mkdir}"
! posix_glob=
! posix_mkdir=
! # Symbolic mode for testing mkdir with directories.
! # It is the same as 755, but also tests that "u+" works.
! test_mode=u=rwx,g=rx,o=rx,u+wx
! # Desired mode of installed file.
! mode=0755
! # Desired mode of newly created intermediate directories.
! # It is empty if not known yet.
! intermediate_mode=
! chmodcmd=$chmodprog
! chowncmd=
! chgrpcmd=
! stripcmd=
! rmcmd="$rmprog -f"
! mvcmd="$mvprog"
! src=
! dst=
! dir_arg=
! dstarg=
! no_target_directory=
! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
! or: $0 [OPTION]... SRCFILES... DIRECTORY
! or: $0 [OPTION]... -t DIRECTORY SRCFILES...
! or: $0 [OPTION]... -d DIRECTORIES...
! In the 1st form, copy SRCFILE to DSTFILE.
! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
! In the 4th, create DIRECTORIES.
! Options:
! -c (ignored)
! -d create directories instead of installing files.
! -g GROUP $chgrpprog installed files to GROUP.
! -m MODE $chmodprog installed files to MODE.
! -o USER $chownprog installed files to USER.
! -s $stripprog installed files.
! -t DIRECTORY install into DIRECTORY.
! -T report an error if DSTFILE is a directory.
! --help display this help and exit.
! --version display version info and exit.
! Environment variables override the default commands:
! CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
! "
! while test -n "$1"; do
! case $1 in
! -c) shift
! continue;;
! -d) dir_arg=true
! shift
! continue;;
! -g) chgrpcmd="$chgrpprog $2"
! shift
! shift
! continue;;
! --help) echo "$usage"; exit $?;;
! -m) mode=$2
! shift
! shift
! continue;;
! -o) chowncmd="$chownprog $2"
! shift
! shift
! continue;;
! -s) stripcmd=$stripprog
! shift
! continue;;
! -t) dstarg=$2
! shift
! shift
! continue;;
! -T) no_target_directory=true
! shift
! continue;;
! --version) echo "$0 $scriptversion"; exit $?;;
! *) # When -d is used, all remaining arguments are directories to create.
! # When -t is used, the destination is already specified.
! test -n "$dir_arg$dstarg" && break
! # Otherwise, the last argument is the destination. Remove it from $@.
! for arg
! do
! if test -n "$dstarg"; then
! # $@ is not empty: it contains at least $arg.
! set fnord "$@" "$dstarg"
! shift # fnord
! fi
! shift # arg
! dstarg=$arg
! done
! break;;
! esac
! done
! if test -z "$1"; then
! if test -z "$dir_arg"; then
! echo "$0: no input file specified." >&2
! exit 1
! fi
! # It's OK to call `install-sh -d' without argument.
! # This can happen when creating conditional directories.
! exit 0
! fi
! test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
! for src
! do
! # Protect names starting with `-'.
! case $src in
! -*) src=./$src ;;
! esac
! if test -n "$dir_arg"; then
! dst=$src
! dstdir=$dst
! test -d "$dstdir"
! dstdir_status=$?
! else
! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
! # if $src (and thus $dsttmp) contains '*'.
! if test ! -f "$src" && test ! -d "$src"; then
! echo "$0: $src does not exist." >&2
! exit 1
! fi
! if test -z "$dstarg"; then
! echo "$0: no destination specified." >&2
! exit 1
! fi
! dst=$dstarg
! # Protect names starting with `-'.
! case $dst in
! -*) dst=./$dst ;;
! esac
! # If destination is a directory, append the input filename; won't work
! # if double slashes aren't ignored.
! if test -d "$dst"; then
! if test -n "$no_target_directory"; then
! echo "$0: $dstarg: Is a directory" >&2
! exit 1
! fi
! dstdir=$dst
! dst=$dstdir/`basename "$src"`
! dstdir_status=0
! else
! # Prefer dirname, but fall back on a substitute if dirname fails.
! dstdir=`
! (dirname "$dst") 2>/dev/null ||
! expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! X"$dst" : 'X\(//\)[^/]' \| \
! X"$dst" : 'X\(//\)$' \| \
! X"$dst" : 'X\(/\)' \| \
! . : '\(.\)' 2>/dev/null ||
! echo X"$dst" |
! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
! /^X\(\/\/\)[^/].*/{ s//\1/; q; }
! /^X\(\/\/\)$/{ s//\1/; q; }
! /^X\(\/\).*/{ s//\1/; q; }
! s/.*/./; q'
! `
! test -d "$dstdir"
! dstdir_status=$?
! fi
! fi
! obsolete_mkdir_used=false
!
! if test $dstdir_status != 0; then
! case $posix_mkdir in
! '')
! posix_mkdir=false
! if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
! posix_mkdir=true
else
! # Remove any dirs left behind by ancient mkdir implementations.
! rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
! fi ;;
! esac
! if
! $posix_mkdir && {
! # With -d, create the new directory with the user-specified mode.
! # Otherwise, create it using the same intermediate mode that
! # mkdir -p would use when creating intermediate directories.
! # POSIX says that this mode is "$(umask -S),u+wx", so use that
! # if umask -S works.
!
! if test -n "$dir_arg"; then
! mkdir_mode=$mode
else
! case $intermediate_mode in
! '')
! if umask_S=`(umask -S) 2>/dev/null`; then
! intermediate_mode=$umask_S,u+wx
! else
! intermediate_mode=$test_mode
! fi ;;
! esac
! mkdir_mode=$intermediate_mode
fi
! $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
! }
! then :
! else
! # mkdir does not conform to POSIX, or it failed possibly due to
! # a race condition. Create the directory the slow way, step by
! # step, checking for races as we go.
! case $dstdir in
! /*) pathcomp=/ ;;
! -*) pathcomp=./ ;;
! *) pathcomp= ;;
! esac
! case $posix_glob in
! '')
! if (set -f) 2>/dev/null; then
! posix_glob=true
! else
! posix_glob=false
! fi ;;
! esac
! oIFS=$IFS
! IFS=/
! $posix_glob && set -f
! set fnord $dstdir
! shift
! $posix_glob && set +f
! IFS=$oIFS
! for d
! do
! test "x$d" = x && continue
! pathcomp=$pathcomp$d
! if test ! -d "$pathcomp"; then
! $mkdirprog "$pathcomp"
! # Don't fail if two instances are running concurrently.
! test -d "$pathcomp" || exit 1
! fi
! pathcomp=$pathcomp/
! done
! obsolete_mkdir_used=true
! fi
! fi
! if test -n "$dir_arg"; then
! { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
! { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
! { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
! test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
! else
! # Make a couple of temp file names in the proper directory.
! dsttmp=$dstdir/_inst.$$_
! rmtmp=$dstdir/_rm.$$_
! # Trap to clean up those temp files at exit.
! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
! # Copy the file name to the temp name.
! $doit $cpprog "$src" "$dsttmp" &&
! # and set any options; do chmod last to preserve setuid bits.
! #
! # If any of these fail, we abort the whole thing. If we want to
! # ignore errors from any of these, just make sure not to ignore
! # errors from the above "$doit $cpprog $src $dsttmp" command.
! #
! { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
! && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
! && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
! # Now rename the file to the real destination.
! { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
! || {
! # The rename failed, perhaps because mv can't rename something else
! # to itself, or perhaps because mv is so ancient that it does not
! # support -f.
! # Now remove or move aside any old file at destination location.
! # We try this two ways since rm can't unlink itself on some
! # systems and the destination file might be busy for other
! # reasons. In this case, the final cleanup might fail but the new
! # file should still install successfully.
! {
! if test -f "$dst"; then
! $doit $rmcmd -f "$dst" 2>/dev/null \
! || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
! && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
! || {
! echo "$0: cannot unlink or rename $dst" >&2
! (exit 1); exit 1
! }
! else
! :
! fi
! } &&
! # Now rename the file to the real destination.
! $doit $mvcmd "$dsttmp" "$dst"
! }
! } || exit 1
! trap '' 0
! fi
! done
!
! # Local variables:
! # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "scriptversion="
! # time-stamp-format: "%:y-%02m-%02d.%02H"
! # time-stamp-end: "$"
! # End:
Index: conf.change.pl
===================================================================
RCS file: /cvsroot/rkward/rkward/admin/conf.change.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** conf.change.pl 27 Jul 2004 23:05:24 -0000 1.2
--- conf.change.pl 13 Sep 2006 12:16:30 -0000 1.3
***************
*** 20,25 ****
# You should have received a copy of the GNU Library General Public License
# along with this library; see the file COPYING.LIB. If not, write to
! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! # Boston, MA 02111-1307, USA.
# we have to change two places
--- 20,25 ----
# You should have received a copy of the GNU Library General Public License
# along with this library; see the file COPYING.LIB. If not, write to
! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
! # Boston, MA 02110-1301, USA.
# we have to change two places
***************
*** 82,86 ****
#
# gg: if a post-processing commands section is found first,
! # stop there and insert a new loop to honour the case/esac.
# (pattern: /^\s+#\sRun the commands associated with the file./)
--- 82,86 ----
#
# gg: if a post-processing commands section is found first,
! # stop there and insert a new loop to honor the case/esac.
# (pattern: /^\s+#\sRun the commands associated with the file./)
--- NEW FILE: doxygen.sh ---
#! /bin/sh
#
# doxygen.sh Copyright (C) 2005 by Adriaan de Groot
# Based on some code from Doxyfile.am, among other things.
# License: GPL version 2.
# See file COPYING in kdelibs for details.
echo "*** doxygen.sh"
# Recurse handling is a little complicated, since normally
# subdir (given on the command-line) processing doesn't recurse
# but you can force it to do so.
recurse=1
recurse_given=NO
use_modulename=1
cleanup=YES
while test -n "$1" ; do
case "x$1" in
"x--no-cleanup" )
cleanup=NO
;;
"x--no-recurse" )
recurse=0
recurse_given=YES
;;
"x--recurse" )
recurse=1
recurse_given=YES
;;
"x--no-modulename" )
use_modulename=0
;;
"x--modulename" )
use_modulename=1
;;
"x--help" )
echo "doxygen.sh usage:"
echo "doxygen.sh [--no-recurse] [--no-modulename] <srcdir> [<subdir>]"
exit 2
;;
x--doxdatadir=* )
DOXDATA=`echo $1 | sed -e 's+--doxdatadir=++'`
;;
x--installdir=*)
PREFIX=`echo $1 | sed -e 's+--installdir=++'`
;;
x--* )
echo "Unknown option: $1"
exit 1
;;
* )
top_srcdir="$1"
break
;;
esac
shift
done
### Sanity check the mandatory "top srcdir" argument.
if test -z "$top_srcdir" ; then
echo "Usage: doxygen.sh <top_srcdir>"
exit 1
fi
if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory."
exit 1
fi
### Normalize top_srcdir so it is an absolute path.
if expr "x$top_srcdir" : "x/" > /dev/null ; then
# top_srcdir is absolute already
:
else
top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd`
if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory."
exit 1
fi
fi
### Sanity check and guess QTDOCDIR.
if test -z "$QTDOCDIR" ; then
if test -z "$QTDIR" ; then
for i in /usr/X11R6/share/doc/qt/html
do
QTDOCDIR="$i"
test -d "$QTDOCDIR" && break
done
else
for i in share/doc/qt/html doc/html
do
QTDOCDIR="$QTDIR/$i"
test -d "$QTDOCDIR" && break
done
fi
fi
if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
if test -z "$QTDOCDIR" ; then
echo "* QTDOCDIR could not be guessed."
else
echo "* QTDOCDIR does not name a directory."
fi
if test -z "$QTDOCTAG" ; then
echo "* QTDOCDIR set to \"\""
QTDOCDIR=""
else
echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
fi
fi
### Get the "top srcdir", also its name, and handle the case that subdir "."
### is given (which would be top_srcdir then, so it's equal to none-given
### but no recursion either).
###
# top_srcdir="$1" # Already set by options processing
module_name=`basename "$top_srcdir"`
subdir="$2"
if test "x." = "x$subdir" ; then
subdir=""
if test "x$recurse_given" = "xNO" ; then
recurse=0
fi
fi
if test "x" != "x$subdir" ; then
# If no recurse option given explicitly, default to
# no recurse when processing subdirs given on the command-line.
if test "x$recurse_given" = "xNO" ; then
recurse=0
fi
fi
if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then
if test -n "$DOXDATA" ; then
echo "* \$DOXDATA is '$DOXDATA' which does not name a directory"
fi
DOXDATA="$top_srcdir/doc/common"
fi
if test ! -d "$DOXDATA" ; then
echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\""
exit 1
fi
if test -n "$PREFIX" && test ! -d "$PREFIX" ; then
echo "* \$PREFIX does not name a directory, tried \"$PREFIX\""
echo "* \$PREFIX is disabled."
PREFIX=""
fi
### We need some values from top-level files, which
### are not preserved between invocations of this
### script, so factor it out for easy use.
create_doxyfile_in()
{
eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"`
echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in
grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \
sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \
-e 's+].*++' >> Doxyfile.in
}
apidoxdir="$module_name"-apidocs
test "x$use_modulename" = "x0" && apidoxdir="apidocs"
### If we're making the top subdir, create the structure
### for the apidox and initialize it. Otherwise, just use the
### structure assumed to be there.
if test -z "$subdir" ; then
if test ! -d "$apidoxdir" ; then
mkdir "$apidoxdir" > /dev/null 2>&1
fi
cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot create and cd into $apidoxdir"
exit 1
}
test -f "Doxyfile.in" || create_doxyfile_in
# Copy in logos and the like
for i in "favicon.ico" "kde_gear_64.png"
do
cp "$DOXDATA/$i" . > /dev/null 2> /dev/null
done
for i in "$top_srcdir/doc/api/Dox-"*.png
do
T=`basename "$i" | sed -e 's+Dox-++'`
test -f "$i" && cp "$i" "./$T" > /dev/null 2> /dev/null
done
top_builddir="."
srcdir="$1"
subdir="."
else
cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot cd into $apidoxdir -- maybe you need to"
echo "build the top-level dox first."
exit 1
}
if test "x1" = "x$recurse" ; then
# OK, so --recurse was requested
if test ! -f "subdirs.top" ; then
echo "* No subdirs.top available in the $apidoxdir."
echo "* The --recurse option will be ignored."
recurse=0
fi
fi
fi
### Read a single line (TODO: support \ continuations) from the Makefile.am.
### Used to extract variable assignments from it.
extract_line()
{
file="$2" ; test -z "$file" && file="$srcdir/Makefile.am"
pattern=`echo "$1" | tr + .`
grep "^$1" "$file" | \
sed -e "s+$pattern.*=\s*++"
}
### Handle the COMPILE_{FIRST,LAST,BEFORE,AFTER} part of Makefile.am
### in the toplevel. Copied from admin/cvs.sh. Licence presumed LGPL).
create_subdirs()
{
echo "* Sorting top-level subdirs"
dirs=
idirs=
if test -f "$top_srcdir/inst-apps"; then
idirs=`cat "$top_srcdir/"inst-apps`
else
idirs=`cd "$top_srcdir" && ls -1 | sort`
fi
compilefirst=""
compilelast=""
if test -f "$top_srcdir/"Makefile.am.in ; then
compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
fi
for i in $idirs; do
if test -f "$top_srcdir/$i"/Makefile.am; then
case " $compilefirst $compilelast " in
*" $i "*) ;;
*) dirs="$dirs $i"
esac
fi
done
: > ./_SUBDIRS
for d in $compilefirst; do
echo $d >> ./_SUBDIRS
done
(for d in $dirs; do
list=""
if test -f "$top_srcdir/"Makefile.am.in ; then
list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
fi
for s in $list; do
echo $s $d
done
list=""
if test -f "$top_srcdir/"Makefile.am.in ; then
list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
fi
for s in $list; do
echo $d $s
done
echo $d $d
done ) | tsort >> ./_SUBDIRS
for d in $compilelast; do
echo $d >> ./_SUBDIRS
done
test -r _SUBDIRS && mv _SUBDIRS subdirs.top || true
}
### Add HTML header, footer, CSS tags to Doxyfile.
### Assumes $subdir is set. Argument is a string
### to stick in front of the file if needed.
apidox_htmlfiles()
{
dox_header="$top_srcdir/doc/api/$1header.html"
dox_footer="$top_srcdir/doc/api/$1footer.html"
dox_css="$top_srcdir/doc/api/doxygen.css"
test -f "$dox_header" || dox_header="$DOXDATA/$1header.html"
test -f "$dox_footer" || dox_footer="$DOXDATA/$1footer.html"
test -f "$dox_css" || dox_css="$DOXDATA/doxygen.css"
echo "HTML_HEADER = $dox_header" >> "$subdir/Doxyfile" ; \
echo "HTML_FOOTER = $dox_footer" >> "$subdir/Doxyfile" ; \
echo "HTML_STYLESHEET = $dox_css" >> "$subdir/Doxyfile"
}
apidox_specials()
{
line=`extract_line DOXYGEN_PROJECTNAME "$1"`
test -n "$line" && echo "PROJECT_NAME = \"$line\"" >> "$2"
}
apidox_local()
{
for i in "$top_srcdir/doc/api/Doxyfile.local"
do
if test -f "$i" ; then
cat "$i" >> "$subdir/Doxyfile"
break
fi
done
}
### Post-process HTML files by substituting in the menu files
#
# In non-top directories, both <!-- menu --> and <!-- gmenu -->
# are calculated and replaced. Top directories get an empty <!-- menu -->
# if any.
doxyndex()
{
# Special case top-level to have an empty MENU.
if test "x$subdir" = "x." ; then
MENU=""
htmldir="."
htmltop="$top_builddir" # Just ., presumably
echo "* Post-processing top-level files"
else
MENU="<ul>"
htmldir="$subdir/html"
htmltop="$top_builddir.." # top_builddir ends with /
echo "* Post-processing files in $htmldir"
# Build a little PHP file that maps class names to file
# names, for the quick-class-picker functionality.
# (The quick-class-picker is disabled due to styling
# problems in IE & FF).
(
echo "<?php \$map = array("; \
for htmlfile in `find $htmldir/ -type f -name "class[A-Z]*.html" | grep -v "\-members.html$"`; do
classname=`echo $htmlfile | sed -e "s,.*/class\\(.*\\).html,\1," -e "s,_1_1,::,g" -e "s,_01, ,g" -e "s,_4,>,g" -e "s+_00+,+g" -e "s+_3+<+g" | tr "[A-Z]" "[a-z]"`
echo " \"$classname\" => \"$htmlfile\","
done | sort ; \
echo ") ?>"
) > "$subdir/classmap.inc"
# This is a list of pairs, with / separators so we can use
# basename and dirname (a crude shell hack) to split them
# into parts. For each, if the file part exists (as a html
# file) tack it onto the MENU variable as a <li> with link.
for i in "Main Page/index" \
"Modules/modules" \
"Namespace List/namespaces" \
"Class Hierarchy/hierarchy" \
"Alphabetical List/classes" \
"Class List/annotated" \
"File List/files" \
"Directories/dirs" \
"Namespace Members/namespacemembers" \
"Class Members/functions" \
"Related Pages/pages"
do
NAME=`dirname "$i"`
FILE=`basename "$i"`
test -f "$htmldir/$FILE.html" && MENU="$MENU<li><a href=\"$FILE.html\">$NAME</a></li>"
done
MENU="$MENU</ul>"
fi
# Get the list of global Menu entries.
GMENU=`cat subdirs | tr -d '\n'`
PMENU=`grep '<!-- pmenu' "$htmldir/index.html" | sed -e 's+.*pmenu *++' -e 's+ *-->++' | awk '{ c=split($0,a,"/"); for (j=1; j<=c; j++) { printf " / <a href=\""; if (j==c) { printf("."); } for (k=j; k<c; k++) { printf "../"; } if (j<c) { printf("../html/index.html"); } printf "\">%s</a>\n" , a[j]; } }' | tr -d '\n'`
# Map the PHP file into HTML options so that
# it can be substituted in for the quick-class-picker.
CMENU=""
# For now, leave the CMENU disabled
CMENUBEGIN="<!--"
CMENUEND="-->"
if test "x$subdir" = "x." ; then
# Disable CMENU on toplevel anyway
CMENUBEGIN="<!--"
CMENUEND="-->"
else
test -f "$subdir/classmap.inc" && \
CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'`
if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then
# Keep the menu, it's useful
:
else
CMENUBEGIN="<!--"
CMENUEND="-->"
fi
fi
# Now substitute in the MENU in every file. This depends
# on HTML_HEADER (ie. header.html) containing the
# <!-- menu --> comment.
for i in "$htmldir"/*.html
do
if test -f "$i" ; then
sed -e "s+<!-- menu -->+$MENU+" \
-e "s+<!-- gmenu -->+$GMENU+" \
-e "s+<!-- pmenu.*-->+$PMENU+" \
-e "s+<!-- cmenu.begin -->+$CMENUBEGIN+" \
-e "s+<!-- cmenu.end -->+$CMENUEND+" \
< "$i" | sed -e "s+ at topdir@+$htmltop+g" > "$i.new" && mv "$i.new" "$i"
sed -e "s+<!-- cmenu -->+$CMENU+" < "$i" > "$i.new"
test -s "$i.new" && mv "$i.new" "$i"
fi
done
}
### Handle the Doxygen processing of a toplevel directory.
apidox_toplevel()
{
echo ""
echo "*** Creating API documentation main page for $module_name"
echo "*"
rm -f "Doxyfile"
for i in "$top_srcdir/doc/api/Doxyfile.global" \
"$top_srcdir/admin/Doxyfile.global" \
"$DOXDATA/Doxyfile.global"
do
if test -f "$i" ; then
cp "$i" Doxyfile
break
fi
done
if test ! -f "Doxyfile" ; then
echo "* Cannot create Doxyfile."
exit 1
fi
cat "$top_builddir/Doxyfile.in" >> Doxyfile
echo "INPUT = $top_srcdir" >> Doxyfile
echo "OUTPUT_DIRECTORY = $top_builddir" >> Doxyfile ; \
echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
echo "RECURSIVE = NO" >> Doxyfile ; \
echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \
echo "HTML_OUTPUT = ." >> Doxyfile ; \
apidox_htmlfiles "main"
# KDevelop has a top-level Makefile.am with settings.
for i in "$top_srcdir/Makefile.am.in" "$top_srcdir/Makefile.am"
do
if test -f "$i" ; then
grep '^DOXYGEN_SET_' "$i" | \
sed -e 's+DOXYGEN_SET_++' -e "s+ at topdir@+$top_srcdir+" >> Doxyfile
apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
break
fi
done
apidox_local
doxygen Doxyfile
( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
for i in `cat subdirs.in`
do
test "x." = "x$i" && continue;
dir=`dirname "$i"`
file=`basename "$i"`
if test "x." = "x$dir" ; then
dir=""
else
dir="$dir/"
fi
indent=`echo "$dir" | sed -e 's+[^/]*/+\ \ +g' | sed -e 's+&+\\\&+g'`
entryname=`extract_line DOXYGEN_SET_PROJECT_NAME "$top_srcdir/$dir/$file/Makefile.am"`
test -z "$entryname" && entryname="$file"
if grep DOXYGEN_EMPTY "$top_srcdir/$dir/$file/Makefile.am" > /dev/null 2>&1 ; then
echo "<li>$indent$file</li>"
else
echo "<li>$indent<a href=\"@topdir@/$dir$file/html/index.html\">$entryname</a></li>"
fi
done > subdirs
doxyndex
}
### Handle the Doxygen processing of a non-toplevel directory.
apidox_subdir()
{
echo ""
echo "*** Creating apidox in $subdir"
echo "*"
rm -f "$subdir/Doxyfile"
if test ! -d "$top_srcdir/$subdir" ; then
echo "* No source (sub)directory $subdir"
return
fi
for i in "$top_srcdir/doc/api/Doxyfile.global" \
"$top_srcdir/admin/Doxyfile.global" \
"$DOXDATA/Doxyfile.global"
do
if test -f "$i" ; then
cp "$i" "$subdir/Doxyfile"
break
fi
done
test -f "Doxyfile.in" || create_doxyfile_in
cat "Doxyfile.in" >> "$subdir/Doxyfile"
echo "PROJECT_NAME = \"$subdir\"" >> "$subdir/Doxyfile"
echo "INPUT = $srcdir" >> "$subdir/Doxyfile"
echo "OUTPUT_DIRECTORY = ." >> "$subdir/Doxyfile"
if grep -l "$subdir/" subdirs.in > /dev/null 2>&1 ; then
echo "RECURSIVE = NO" >> "$subdir/Doxyfile"
fi
echo "HTML_OUTPUT = $subdir/html" >> "$subdir/Doxyfile"
echo "GENERATE_TAGFILE = $subdir/$subdirname.tag" >> "$subdir/Doxyfile"
test -d "$top_srcdir/doc/api" && \
echo "IMAGE_PATH = $top_srcdir/doc/api" >> "$subdir/Doxyfile"
apidox_htmlfiles ""
# Makefile.ams may contain overrides to our settings,
# so copy them in.
grep '^DOXYGEN_SET_' "$srcdir/Makefile.am" | \
sed -e 's+DOXYGEN_SET_++' >> "$subdir/Doxyfile"
apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
excludes=`extract_line DOXYGEN_EXCLUDE`
if test -n "$excludes"; then
patterns=""
dirs=""
for item in `echo "$excludes"`; do
if test -d "$top_srcdir/$subdir/$item"; then
dirs="$dirs $top_srcdir/$subdir/$item/"
else
patterns="$patterns $item"
fi
done
echo "EXCLUDE_PATTERNS += $patterns" >> "$subdir/Doxyfile"
echo "EXCLUDE += $dirs" >> "$subdir/Doxyfile"
fi
echo "TAGFILES = \\" >> "$subdir/Doxyfile"
## For now, don't support \ continued references lines
tags=`extract_line DOXYGEN_REFERENCES`
for i in $tags qt ; do
tagsubdir=`dirname $i` ; tag=`basename $i`
tagpath=""
not_found=""
if test "x$tagsubdir" = "x." ; then
tagsubdir=""
else
tagsubdir="$tagsubdir/"
fi
# Find location of tag file
if test -f "$tagsubdir$tag/$tag.tag" ; then
file="$tagsubdir$tag/$tag.tag"
loc="$tagsubdir$tag/html"
else
# This checks for dox built with_out_ --no-modulename
# in the same build dir as this dox run was started in.
file=`ls -1 ../*-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
if test -n "$file" ; then
loc=`echo "$file" | sed -e "s/$tag.tag\$/html/"`
else
# If the tag file doesn't exist yet, but should
# because we have the right dirs here, queue
# this directory for re-processing later.
if test -d "$top_srcdir/$tagsubdir$tag" ; then
echo "* Need to re-process $subdir for tag $i"
echo "$subdir" >> "subdirs.later"
else
# Re-check in $PREFIX if needed.
test -n "$PREFIX" && \
file=`cd "$PREFIX" && \
ls -1 *-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
# If something is found, patch it up. The location must be
# relative to the installed location of the dox and the
# file must be absolute.
if test -n "$file" ; then
loc=`echo "../$file" | sed -e "s/$tag.tag\$/html/"`
file="$PREFIX/$file"
echo "* Tags for $tagsubdir$tag will only work when installed."
not_found="YES"
fi
fi
fi
fi
if test "$tag" = "qt" ; then
if test -z "$QTDOCDIR" ; then
echo " $file" >> "$subdir/Doxyfile"
else
if test -z "$file" ; then
# Really no Qt tags
echo "" >> "$subdir/Doxyfile"
else
echo " $file=$QTDOCDIR" >> "$subdir/Doxyfile"
fi
fi
else
if test -n "$file" ; then
test -z "$not_found" && echo "* Found tag $file"
echo " $file=../$top_builddir$loc \\" >> "$subdir/Doxyfile"
fi
fi
done
apidox_local
if grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then
# This directory is empty, so don't process it, but
# *do* handle subdirs that might have dox.
:
else
# Regular processing
doxygen "$subdir/Doxyfile"
doxyndex
fi
}
### Run a given subdir by setting up global variables first.
do_subdir()
{
subdir=`echo "$1" | sed -e 's+/$++'`
srcdir="$top_srcdir/$subdir"
subdirname=`basename "$subdir"`
mkdir -p "$subdir" 2> /dev/null
if test ! -d "$subdir" ; then
echo "Can't create dox subdirectory $subdir"
return
fi
top_builddir=`echo "/$subdir" | sed -e 's+/[^/]*+../+g'`
apidox_subdir
}
### Create installdox-slow in the toplevel
create_installdox()
{
# Fix up the installdox script so it accepts empty args
#
# This code is copied from the installdox generated by Doxygen,
# copyright by Dimitri van Heesch and released under the GPL.
# This does a _slow_ update of the dox, because it loops
# over the given substitutions instead of assuming all the
# needed ones are given.
#
cat <<\EOF
#! /usr/bin/env perl
%subst = () ;
$quiet = 0;
if (open(F,"search.cfg"))
{
$_=<F> ; s/[ \t\n]*$//g ; $subst{"_doc"} = $_;
$_=<F> ; s/[ \t\n]*$//g ; $subst{"_cgi"} = $_;
}
while ( @ARGV ) {
$_ = shift @ARGV;
if ( s/^-// ) {
if ( /^l(.*)/ ) {
$v = ($1 eq "") ? shift @ARGV : $1;
($v =~ /\/$/) || ($v .= "/");
$_ = $v;
if ( /(.+)\@(.+)/ ) {
$subst{$1} = $2;
} else {
print STDERR "Argument $_ is invalid for option -l\n";
&usage();
}
}
elsif ( /^q/ ) {
$quiet = 1;
}
elsif ( /^\?|^h/ ) {
&usage();
}
else {
print STDERR "Illegal option -$_\n";
&usage();
}
}
else {
push (@files, $_ );
}
}
if ( ! @files ) {
if (opendir(D,".")) {
foreach $file ( readdir(D) ) {
$match = ".html";
next if ( $file =~ /^\.\.?$/ );
($file =~ /$match/) && (push @files, $file);
($file =~ "tree.js") && (push @files, $file);
}
closedir(D);
}
}
if ( ! @files ) {
print STDERR "Warning: No input files given and none found!\n";
}
foreach $f (@files)
{
if ( ! $quiet ) {
print "Editing: $f...\n";
}
$oldf = $f;
$f .= ".bak";
unless (rename $oldf,$f) {
print STDERR "Error: cannot rename file $oldf\n";
exit 1;
}
if (open(F,"<$f")) {
unless (open(G,">$oldf")) {
print STDERR "Error: opening file $oldf for writing\n";
exit 1;
}
if ($oldf ne "tree.js") {
while (<F>) {
foreach $sub (keys %subst) {
s/doxygen\=\"$sub\:([^ \"\t\>\<]*)\" (href|src)=\"\1/doxygen\=\"$sub:$subst{$sub}\" \2=\"$subst{$sub}/g;
print G "$_";
}
}
}
else {
while (<F>) {
foreach $sub (keys %subst) {
s/\"$sub\:([^ \"\t\>\<]*)\", \"\1/\"$sub:$subst{$sub}\" ,\"$subst{$sub}/g;
print G "$_";
}
}
}
}
else {
print STDERR "Warning file $f does not exist\n";
}
unlink $f;
}
sub usage {
print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n";
print STDERR "Options:\n";
print STDERR " -l tagfile\@linkName tag file + URL or directory \n";
print STDERR " -q Quiet mode\n\n";
exit 1;
}
EOF
}
# Do only the subdirs that match the RE passed in as $1
do_subdirs_re()
{
RE=`echo "$1" | sed -e 's+/$++'`
# Here's a queue of dirs to re-process later when
# all the rest have been done already.
> subdirs.later
# subdirs.top lists _all_ subdirs of top in the order they
# should be handled; subdirs.in lists those dirs that contain
# dox. So the intersection of the two is the ordered list
# of top-level subdirs that contain dox.
#
# subdirs.top also doesn't contain ".", so that special
# case can be ignored in the loop.
(
for i in `grep "^$RE" subdirs.top`
do
if test "x$i" = "x." ; then
continue
fi
# Calculate intersection of this element and the
# set of dox dirs.
if grep "^$i\$" subdirs.in > /dev/null 2>&1 ; then
echo "$i"
mkdir -p "$i" 2> /dev/null
# Handle the subdirs of this one
for j in `grep "$i/" subdirs.in`
do
echo "$j"
mkdir -p "$j" 2> /dev/null
done
fi
done
# Now we still need to handle whatever is left
for i in `cat subdirs.in`
do
test -d "$i" || echo "$i"
mkdir -p "$i" 2> /dev/null
done
) > subdirs.sort
for i in `cat subdirs.sort`
do
do_subdir "$i"
done
if test -s "subdirs.later" ; then
sort subdirs.later | uniq > subdirs.sort
for i in `cat subdirs.sort`
do
: > subdirs.later
echo "*** Reprocessing $i"
do_subdir "$i"
test -s "subdirs.later" && echo "* Some tag files were still not found."
done
fi
}
if test "x." = "x$top_builddir" ; then
apidox_toplevel
create_subdirs
create_installdox > installdox-slow
if test "x$recurse" = "x1" ; then
if test "x$module_name" = "xkdelibs" ; then
if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
test ! -f "qt/qt.tag" ; then
# Special case: create a qt tag file.
echo "*** Creating a tag file for the Qt library:"
mkdir qt
doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
fi
fi
if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
echo "*** Copying tag file for the Qt library:"
mkdir qt
cp "$QTDOCTAG" qt/qt.tag
fi
do_subdirs_re "."
fi
else
if test "x$recurse" = "x1" ; then
do_subdirs_re "$subdir"
else
do_subdir "$subdir"
fi
fi
# At the end of a run, clean up stuff.
if test "YES" = "$cleanup" ; then
rm -f subdirs.in subdirs.later subdirs.sort subdirs.top Doxyfile.in
rm -f `find . -name Doxyfile`
rm -f qt/qt.tag
rmdir qt > /dev/null 2>&1
fi
exit 0
More information about the rkward-tracker
mailing list