[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] storm ./Makefile kde/Makefile kde/Makefile.in k...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] storm ./Makefile kde/Makefile kde/Makefile.in k... |
|
Date: |
Wed, 21 May 2003 20:14:09 -0400 |
CVSROOT: /cvsroot/storm
Module name: storm
Changes by: Benja Fallenstein <address@hidden> 03/05/21 20:14:08
Modified files:
. : Makefile
kde : Makefile Makefile.in aclocal.m4 config.h
config.h.in config.log config.status configure
stamp-h.in
kde/doc : Makefile
kde/doc/en : Makefile
kde/kmd : Makefile kmd.cpp kmd.h kmd.protocol
kde/po : Makefile
org/nongnu/storm/impl: DirDB.java DirPool.java
org/nongnu/storm/pointers: PointerIndex.java SetPointer.java
org/nongnu/storm/util: HTTPProxy.java
Log message:
Save in KDE works!!!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/Makefile.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/aclocal.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/config.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/config.h.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/config.log.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/config.status.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/configure.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/stamp-h.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/doc/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/doc/en/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/kmd.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/kmd.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/kmd.protocol.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/po/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/DirDB.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/DirPool.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/PointerIndex.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/SetPointer.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HTTPProxy.java.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
Patches:
Index: storm/Makefile
diff -u storm/Makefile:1.19 storm/Makefile:1.20
--- storm/Makefile:1.19 Wed May 21 16:19:43 2003
+++ storm/Makefile Wed May 21 20:14:08 2003
@@ -22,7 +22,7 @@
exec $(JAVA) $(DEBUG) org.nongnu.storm.modules.gispmap.GispP2PMap
$(SEEDS)
http-gateway:
- exec $(JAVA) $(DEBUG) org.nongnu.storm.util.HTTPProxy $(POOL)
+ exec $(JAVA) $(DEBUG) org.nongnu.storm.util.HTTPProxy $(POOL) $(KEYFILE)
peer:
exec $(JAVA) $(DEBUG) org.nongnu.storm.modules.gispmap.GispPeer $(ARGS)
Index: storm/kde/Makefile
diff -u storm/kde/Makefile:1.2 storm/kde/Makefile:1.3
--- storm/kde/Makefile:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/Makefile Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
-# Generated automatically from Makefile.in by config.pl.
-# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
+# Generated automatically from Makefile.in by configure.
+# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -19,7 +19,6 @@
srcdir = .
top_srcdir = .
-VPATH = .
prefix = /usr
exec_prefix = ${prefix}
#>-
@@ -253,7 +252,7 @@
DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
$(KDE_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
#>- all: all-redirect
#>+ 1
@@ -383,7 +382,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique
$(LISP) -o $$here/TAGS)
+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags
config.h.in $$unique $(LISP))
mostlyclean-tags:
Index: storm/kde/Makefile.in
diff -u storm/kde/Makefile.in:1.1 storm/kde/Makefile.in:1.2
--- storm/kde/Makefile.in:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/Makefile.in Wed May 21 20:14:08 2003
@@ -1,4 +1,4 @@
-# KDE tags expanded automatically by am_edit - $Revision: 1.1 $
+# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -252,7 +252,7 @@
DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
$(KDE_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
#>- all: all-redirect
#>+ 1
@@ -382,7 +382,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique
$(LISP) -o $$here/TAGS)
+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags
config.h.in $$unique $(LISP))
mostlyclean-tags:
Index: storm/kde/aclocal.m4
diff -u storm/kde/aclocal.m4:1.1 storm/kde/aclocal.m4:1.2
--- storm/kde/aclocal.m4:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/aclocal.m4 Wed May 21 20:14:08 2003
@@ -5763,7 +5763,7 @@
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
AC_DEFUN([AM_PROG_LEX],
[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
+AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
AC_PROG_LEX
AC_DECL_YYTEXT])
Index: storm/kde/config.h
diff -u storm/kde/config.h:1.1 storm/kde/config.h:1.2
--- storm/kde/config.h:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/config.h Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
/* config.h. Generated automatically by configure. */
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated automatically from configure.in by autoheader 2.13.
*/
/* The number of bytes in a char. */
#define SIZEOF_CHAR 1
Index: storm/kde/config.h.in
diff -u storm/kde/config.h.in:1.1 storm/kde/config.h.in:1.2
--- storm/kde/config.h.in:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/config.h.in Wed May 21 20:14:08 2003
@@ -1,4 +1,4 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated automatically from configure.in by autoheader 2.13.
*/
/* The number of bytes in a char. */
#undef SIZEOF_CHAR
Index: storm/kde/config.log
diff -u storm/kde/config.log:1.1 storm/kde/config.log:1.2
--- storm/kde/config.log:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/config.log Wed May 21 20:14:08 2003
@@ -91,45 +91,45 @@
configure:5037: gcc -o conftest -O2 conftest.c -lresolv 1>&5
configure:5062: checking for killpg in -lucb
configure:5150: checking size of int
-configure:5188: checking size of long
-configure:5226: checking size of char *
-configure:5264: checking size of char
-configure:5304: checking for dlopen in -ldl
-configure:5348: checking for shl_unload in -ldld
-configure:5396: checking for extra includes
-configure:5427: checking for extra libs
-configure:5461: checking for libz
-configure:5540: checking for X
-configure:5829: checking for IceConnectionNumber in -lICE
-configure:5877: checking for libXext
-configure:5930: checking for Xinerama
-configure:6042: checking for pthread_create in -lpthread
-configure:6337: checking for libpng
-configure:6403: checking for libjpeg6b
-configure:6464: checking for libjpeg
-configure: 6542: /usr/include/jpeglib.h
+configure:5189: checking size of long
+configure:5228: checking size of char *
+configure:5267: checking size of char
+configure:5308: checking for dlopen in -ldl
+configure:5352: checking for shl_unload in -ldld
+configure:5400: checking for extra includes
+configure:5431: checking for extra libs
+configure:5465: checking for libz
+configure:5544: checking for X
+configure:5833: checking for IceConnectionNumber in -lICE
+configure:5881: checking for libXext
+configure:5934: checking for Xinerama
+configure:6046: checking for pthread_create in -lpthread
+configure:6341: checking for libpng
+configure:6407: checking for libjpeg6b
+configure:6468: checking for libjpeg
+configure: 6546: /usr/include/jpeglib.h
taking that
-configure:6705: checking for Qt
-configure:6946: checking if Qt compiles without flags
-configure:7112: checking for moc
-configure:7178: checking for uic
-configure:7247: checking whether uic supports -L
-configure:7279: checking whether uic supports -nounload
-configure:7334: checking if Qt needs -ljpeg
-configure:7417: checking for rpath
-configure:7446: checking for KDE
-configure:7626: checking for KDE paths
-configure:8155: checking for dcopidl
-configure:8215: checking for dcopidl2cpp
-configure:8275: checking for mcopidl
-configure:8335: checking for artsc-config
-configure:8395: checking for kde-config
-configure:8451: checking for meinproc
-configure: 8515: /usr/share/kde/apps/ksgmltools2/customization/kde-chunk.xsl
-configure: 8515: /usr/local/share/apps/ksgmltools2/customization/kde-chunk.xsl
-configure: 8515: /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
+configure:6709: checking for Qt
+configure:6950: checking if Qt compiles without flags
+configure:7116: checking for moc
+configure:7182: checking for uic
+configure:7251: checking whether uic supports -L
+configure:7283: checking whether uic supports -nounload
+configure:7338: checking if Qt needs -ljpeg
+configure:7421: checking for rpath
+configure:7450: checking for KDE
+configure:7630: checking for KDE paths
+configure:8159: checking for dcopidl
+configure:8219: checking for dcopidl2cpp
+configure:8279: checking for mcopidl
+configure:8339: checking for artsc-config
+configure:8399: checking for kde-config
+configure:8455: checking for meinproc
+configure: 8519: /usr/share/kde/apps/ksgmltools2/customization/kde-chunk.xsl
+configure: 8519: /usr/local/share/apps/ksgmltools2/customization/kde-chunk.xsl
+configure: 8519: /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
taking that
-configure:8682: checking if doc should be compiled
-configure:8682: checking if kmd should be compiled
-configure:8682: checking if kmd-0.2 should be compiled
-configure:8682: checking if po should be compiled
+configure:8686: checking if doc should be compiled
+configure:8686: checking if kmd should be compiled
+configure:8686: checking if kmd-0.2 should be compiled
+configure:8686: checking if po should be compiled
Index: storm/kde/config.status
diff -u storm/kde/config.status:1.2 storm/kde/config.status:1.3
--- storm/kde/config.status:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/config.status Wed May 21 20:14:08 2003
@@ -201,22 +201,92 @@
# Split the substitutions into bite-sized pieces for seds with
# small command number limits, like on Digital OSF/1 and HP-UX.
-CONFIG_FILES=${CONFIG_FILES-"./Makefile doc/Makefile doc/en/Makefile
kmd/Makefile po/Makefile "}
-#echo Doing the fast build of Makefiles -- autoconf 213
-if test "x$ac_cs_root" = "x" ; then
- ac_cs_root=conftest
-fi
-rm -f $ac_cs_root.sacfiles
-for ac_file in .. $CONFIG_FILES ; do
- if test "x$ac_file" != x..; then
- echo $ac_file >> $ac_cs_root.sacfiles
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+ else
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+ fi
+ if test ! -s conftest.s$ac_file; then
+ ac_more_lines=false
+ rm -f conftest.s$ac_file
+ else
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f conftest.s$ac_file"
+ else
+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
fi
+ ac_file=`expr $ac_file + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
+ fi
done
-if test -f $ac_cs_root.sacfiles ; then
- perl admin/config.pl "$ac_cs_root.subs" "$ac_cs_root.sacfiles"
"$ac_given_srcdir" "$ac_given_INSTALL"
+if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
fi
-rm -f $ac_cs_root.s*
+CONFIG_FILES=${CONFIG_FILES-"./Makefile doc/Makefile doc/en/Makefile
kmd/Makefile po/Makefile "}
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ case "$ac_file" in
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ *) ac_file_in="${ac_file}.in" ;;
+ esac
+
+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ # The file is in a subdirectory.
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+ else
+ ac_dir_suffix= ac_dots=
+ fi
+
+ case "$ac_given_srcdir" in
+ .) srcdir=.
+ if test -z "$ac_dots"; then top_srcdir=.
+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+ *) # Relative path.
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ case "$ac_given_INSTALL" in
+ [/$]*) INSTALL="$ac_given_INSTALL" ;;
+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+ esac
+
+ echo creating "$ac_file"
+ rm -f "$ac_file"
+ configure_input="Generated automatically from `echo $ac_file_in|sed
's%.*/%%'` by configure."
+ case "$ac_file" in
+ *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+ *) ac_comsub= ;;
+ esac
+
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:%
$ac_given_srcdir/%g"`
+ sed -e "$ac_comsub
address@hidden@%$configure_input%g
address@hidden@%$srcdir%g
address@hidden@%$top_srcdir%g
address@hidden@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
Index: storm/kde/configure
diff -u storm/kde/configure:1.1 storm/kde/configure:1.2
--- storm/kde/configure:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/configure Wed May 21 20:14:08 2003
@@ -3936,7 +3936,7 @@
if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; };
then
for file in conftest.*; do
case $file in
- *.c | *.o | *.obj) ;;
+ *.$ac_ext | *.c | *.o | *.obj) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
@@ -5157,6 +5157,7 @@
#line 5158 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
@@ -5165,7 +5166,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -5184,7 +5185,7 @@
EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:5188: checking size of long" >&5
+echo "configure:5189: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5192,9 +5193,10 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 5196 "configure"
+#line 5197 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
@@ -5203,7 +5205,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -5222,7 +5224,7 @@
EOF
echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:5226: checking size of char *" >&5
+echo "configure:5228: checking size of char *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5230,9 +5232,10 @@
ac_cv_sizeof_char_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 5234 "configure"
+#line 5236 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
@@ -5241,7 +5244,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char_p=`cat conftestval`
else
@@ -5260,7 +5263,7 @@
EOF
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:5264: checking size of char" >&5
+echo "configure:5267: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5268,9 +5271,10 @@
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 5272 "configure"
+#line 5275 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
@@ -5279,7 +5283,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -5300,7 +5304,7 @@
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5304: checking for dlopen in -ldl" >&5
+echo "configure:5308: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5308,7 +5312,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5312 "configure"
+#line 5316 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5319,7 +5323,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5344,7 +5348,7 @@
echo $ac_n "checking for shl_unload in -ldld""... $ac_c" 1>&6
-echo "configure:5348: checking for shl_unload in -ldld" >&5
+echo "configure:5352: checking for shl_unload in -ldld" >&5
ac_lib_var=`echo dld'_'shl_unload | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5352,7 +5356,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5356 "configure"
+#line 5360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5363,7 +5367,7 @@
shl_unload()
; return 0; }
EOF
-if { (eval echo configure:5367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5392,7 +5396,7 @@
echo $ac_n "checking for extra includes""... $ac_c" 1>&6
-echo "configure:5396: checking for extra includes" >&5
+echo "configure:5400: checking for extra includes" >&5
# Check whether --with-extra-includes or --without-extra-includes was given.
if test "${with_extra_includes+set}" = set; then
withval="$with_extra_includes"
@@ -5423,7 +5427,7 @@
kde_extra_libs=
echo $ac_n "checking for extra libs""... $ac_c" 1>&6
-echo "configure:5427: checking for extra libs" >&5
+echo "configure:5431: checking for extra libs" >&5
# Check whether --with-extra-libs or --without-extra-libs was given.
if test "${with_extra_libs+set}" = set; then
withval="$with_extra_libs"
@@ -5457,7 +5461,7 @@
echo $ac_n "checking for libz""... $ac_c" 1>&6
-echo "configure:5461: checking for libz" >&5
+echo "configure:5465: checking for libz" >&5
if eval "test \"`echo '$''{'ac_cv_lib_z'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5474,7 +5478,7 @@
kde_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 5478 "configure"
+#line 5482 "configure"
#include "confdefs.h"
#include<zlib.h>
@@ -5483,7 +5487,7 @@
return (zlibVersion() == ZLIB_VERSION);
; return 0; }
EOF
-if { (eval echo configure:5487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_z='-lz'"
else
@@ -5536,7 +5540,7 @@
if test "$kde_use_qt_emb" = "no"; then
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5540: checking for X" >&5
+echo "configure:5544: checking for X" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -5570,12 +5574,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5574 "configure"
+#line 5578 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5644,14 +5648,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5648 "configure"
+#line 5652 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -5825,7 +5829,7 @@
# libraries we check for below, so use a different variable.
# address@hidden, address@hidden
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:5829: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:5833: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5833,7 +5837,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5837 "configure"
+#line 5841 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5844,7 +5848,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5873,7 +5877,7 @@
echo $ac_n "checking for libXext""... $ac_c" 1>&6
-echo "configure:5877: checking for libXext" >&5
+echo "configure:5881: checking for libXext" >&5
if eval "test \"`echo '$''{'kde_cv_have_libXext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5885,7 +5889,7 @@
LIBS="-lXext -lX11 $LIBSOCKET"
cat > conftest.$ac_ext <<EOF
-#line 5889 "configure"
+#line 5893 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -5899,7 +5903,7 @@
; return 0; }
EOF
-if { (eval echo configure:5903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
kde_cv_have_libXext=yes
else
@@ -5926,7 +5930,7 @@
fi
echo $ac_n "checking for Xinerama""... $ac_c" 1>&6
-echo "configure:5930: checking for Xinerama" >&5
+echo "configure:5934: checking for Xinerama" >&5
# Check whether --with-xinerama or --without-xinerama was given.
if test "${with_xinerama+set}" = set; then
@@ -5956,7 +5960,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 5960 "configure"
+#line 5964 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
@@ -5964,7 +5968,7 @@
XineramaIsActive(NULL);
; return 0; }
EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_xinerama="yes"
else
@@ -6038,7 +6042,7 @@
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:6042: checking for pthread_create in -lpthread" >&5
+echo "configure:6046: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6046,7 +6050,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6050 "configure"
+#line 6054 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6057,7 +6061,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6098,17 +6102,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6102: checking for $ac_hdr" >&5
+echo "configure:6106: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6107 "configure"
+#line 6111 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6140,7 +6144,7 @@
kde_use_kernthreads=no
else
echo $ac_n "checking for pthread_join in -llthread""... $ac_c"
1>&6
-echo "configure:6144: checking for pthread_join in -llthread" >&5
+echo "configure:6148: checking for pthread_join in -llthread" >&5
ac_lib_var=`echo lthread'_'pthread_join | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6148,7 +6152,7 @@
ac_save_LIBS="$LIBS"
LIBS="-llthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6152 "configure"
+#line 6156 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6159,7 +6163,7 @@
pthread_join()
; return 0; }
EOF
-if { (eval echo configure:6163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6189,7 +6193,7 @@
if test -z "$LIBPTHREAD"; then
echo $ac_n "checking whether $CXX supports -pthread""... $ac_c" 1>&6
-echo "configure:6193: checking whether $CXX supports -pthread" >&5
+echo "configure:6197: checking whether $CXX supports -pthread" >&5
kde_cache=`echo pthread | sed 'y% .=/+-%____p_%'`
if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6209,14 +6213,14 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -pthread"
cat > conftest.$ac_ext <<EOF
-#line 6213 "configure"
+#line 6217 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:6220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "kde_cv_prog_cxx_$kde_cache=yes"
else
@@ -6252,7 +6256,7 @@
solaris*)
echo $ac_n "checking whether $CXX supports -mt""... $ac_c" 1>&6
-echo "configure:6256: checking whether $CXX supports -mt" >&5
+echo "configure:6260: checking whether $CXX supports -mt" >&5
kde_cache=`echo mt | sed 'y% .=/+-%____p_%'`
if eval "test \"`echo '$''{'kde_cv_prog_cxx_$kde_cache'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6272,14 +6276,14 @@
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -mt"
cat > conftest.$ac_ext <<EOF
-#line 6276 "configure"
+#line 6280 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "kde_cv_prog_cxx_$kde_cache=yes"
else
@@ -6333,7 +6337,7 @@
echo $ac_n "checking for libpng""... $ac_c" 1>&6
-echo "configure:6337: checking for libpng" >&5
+echo "configure:6341: checking for libpng" >&5
if eval "test \"`echo '$''{'ac_cv_lib_png'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6354,7 +6358,7 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 6358 "configure"
+#line 6362 "configure"
#include "confdefs.h"
#include<png.h>
@@ -6367,7 +6371,7 @@
; return 0; }
EOF
-if { (eval echo configure:6371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
else
@@ -6399,7 +6403,7 @@
echo $ac_n "checking for libjpeg6b""... $ac_c" 1>&6
-echo "configure:6403: checking for libjpeg6b" >&5
+echo "configure:6407: checking for libjpeg6b" >&5
if eval "test \"`echo '$''{'ac_cv_lib_jpeg_6b'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6416,7 +6420,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 6420 "configure"
+#line 6424 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
struct jpeg_decompress_struct;
@@ -6437,7 +6441,7 @@
jpeg_CreateDecompress(0L, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
else
@@ -6460,7 +6464,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libjpeg""... $ac_c" 1>&6
-echo "configure:6464: checking for libjpeg" >&5
+echo "configure:6468: checking for libjpeg" >&5
if eval "test \"`echo '$''{'ac_cv_lib_jpeg_normal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6477,7 +6481,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 6481 "configure"
+#line 6485 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
struct jpeg_decompress_struct;
@@ -6498,7 +6502,7 @@
jpeg_CreateDecompress(0L, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:6502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_jpeg_normal=-ljpeg"
else
@@ -6538,7 +6542,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 6542: $i/$j" >&5
+ echo "configure: 6546: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
@@ -6701,7 +6705,7 @@
fi
echo $ac_n "checking for Qt""... $ac_c" 1>&6
-echo "configure:6705: checking for Qt" >&5
+echo "configure:6709: checking for Qt" >&5
if test "x$kde_use_qt_emb" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
@@ -6765,7 +6769,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 6769: $i/$j" >&5
+ echo "configure: 6773: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
@@ -6877,7 +6881,7 @@
EOF
-if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
+if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
rm -f conftest*
else
echo "configure: failed program was:" >&5
@@ -6942,7 +6946,7 @@
echo $ac_n "checking if Qt compiles without flags""... $ac_c" 1>&6
-echo "configure:6946: checking if Qt compiles without flags" >&5
+echo "configure:6950: checking if Qt compiles without flags" >&5
if eval "test \"`echo '$''{'kde_cv_qt_direct'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7038,7 +7042,7 @@
EOF
-if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
+if { (eval echo configure:7046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
kde_cv_qt_direct="yes"
else
kde_cv_qt_direct="no"
@@ -7108,7 +7112,7 @@
echo $ac_n "checking for moc""... $ac_c" 1>&6
-echo "configure:7112: checking for moc" >&5
+echo "configure:7116: checking for moc" >&5
if test -n "$MOC"; then
kde_cv_path="$MOC";
else
@@ -7174,7 +7178,7 @@
if test -z "$UIC_NOT_NEEDED"; then
echo $ac_n "checking for uic""... $ac_c" 1>&6
-echo "configure:7178: checking for uic" >&5
+echo "configure:7182: checking for uic" >&5
if test -n "$UIC"; then
kde_cv_path="$UIC";
else
@@ -7243,7 +7247,7 @@
elif test $kde_qtver = 3; then
echo $ac_n "checking whether uic supports -L ""... $ac_c" 1>&6
-echo "configure:7247: checking whether uic supports -L " >&5
+echo "configure:7251: checking whether uic supports -L " >&5
kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
if eval "test \"`echo '$''{'kde_cv_prog_uic_$kde_cache'+set}'`\" = set";
then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7253,7 +7257,7 @@
<!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
EOT
ac_uic_testrun="$UIC -L /nonexistant conftest.ui >/dev/null"
- if { (eval echo configure:7257: \"$ac_uic_testrun\") 1>&5; (eval
$ac_uic_testrun) 2>&5; }; then
+ if { (eval echo configure:7261: \"$ac_uic_testrun\") 1>&5; (eval
$ac_uic_testrun) 2>&5; }; then
eval "kde_cv_prog_uic_$kde_cache=yes"
else
eval "kde_cv_prog_uic_$kde_cache=no"
@@ -7275,7 +7279,7 @@
echo $ac_n "checking whether uic supports -nounload ""... $ac_c" 1>&6
-echo "configure:7279: checking whether uic supports -nounload " >&5
+echo "configure:7283: checking whether uic supports -nounload " >&5
kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
if eval "test \"`echo '$''{'kde_cv_prog_uic_$kde_cache'+set}'`\" = set";
then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7285,7 +7289,7 @@
<!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
EOT
ac_uic_testrun="$UIC -nounload conftest.ui >/dev/null"
- if { (eval echo configure:7289: \"$ac_uic_testrun\") 1>&5; (eval
$ac_uic_testrun) 2>&5; }; then
+ if { (eval echo configure:7293: \"$ac_uic_testrun\") 1>&5; (eval
$ac_uic_testrun) 2>&5; }; then
eval "kde_cv_prog_uic_$kde_cache=yes"
else
eval "kde_cv_prog_uic_$kde_cache=no"
@@ -7330,7 +7334,7 @@
echo $ac_n "checking if Qt needs $LIBJPEG""... $ac_c" 1>&6
-echo "configure:7334: checking if Qt needs $LIBJPEG" >&5
+echo "configure:7338: checking if Qt needs $LIBJPEG" >&5
if eval "test \"`echo '$''{'kde_cv_qt_jpeg'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7352,7 +7356,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 7356 "configure"
+#line 7360 "configure"
#include "confdefs.h"
#include <qapplication.h>
int main() {
@@ -7362,7 +7366,7 @@
QApplication app(argc, argv);
; return 0; }
EOF
-if { (eval echo configure:7366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "kde_cv_qt_jpeg=no"
else
@@ -7413,7 +7417,7 @@
echo $ac_n "checking for rpath""... $ac_c" 1>&6
-echo "configure:7417: checking for rpath" >&5
+echo "configure:7421: checking for rpath" >&5
# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
enableval="$enable_rpath"
@@ -7442,7 +7446,7 @@
echo "$ac_t""$USE_RPATH" 1>&6
echo $ac_n "checking for KDE""... $ac_c" 1>&6
-echo "configure:7446: checking for KDE" >&5
+echo "configure:7450: checking for KDE" >&5
if test "${prefix}" != NONE; then
kde_includes=${prefix}/include
@@ -7486,7 +7490,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 7490: $i/$j" >&5
+ echo "configure: 7494: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
@@ -7512,7 +7516,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 7516: $i/$j" >&5
+ echo "configure: 7520: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
@@ -7622,7 +7626,7 @@
echo $ac_n "checking for KDE paths""... $ac_c" 1>&6
-echo "configure:7626: checking for KDE paths" >&5
+echo "configure:7630: checking for KDE paths" >&5
kde_result=""
kde_cached_paths=yes
if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
@@ -7721,7 +7725,7 @@
echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:7725: checking for KDE headers installed" >&5
+echo "configure:7729: checking for KDE headers installed" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -7766,7 +7770,7 @@
EOF
ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:7770: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ if { (eval echo configure:7774: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
echo "$ac_t""yes" 1>&6
else
{ echo "configure: error: your system is not able to compile a small KDE
application!
@@ -7803,10 +7807,10 @@
fi
echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:7807: checking for KDE libraries installed" >&5
+echo "configure:7811: checking for KDE libraries installed" >&5
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
+if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
echo "$ac_t""yes" 1>&6
else
{ echo "configure: error: your system fails at linking a small KDE
application!
@@ -7974,7 +7978,7 @@
echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-echo "configure:7978: checking for KDE headers installed" >&5
+echo "configure:7982: checking for KDE headers installed" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -8019,7 +8023,7 @@
EOF
ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
- if { (eval echo configure:8023: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ if { (eval echo configure:8027: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
echo "$ac_t""yes" 1>&6
else
{ echo "configure: error: your system is not able to compile a small KDE
application!
@@ -8056,10 +8060,10 @@
fi
echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-echo "configure:8060: checking for KDE libraries installed" >&5
+echo "configure:8064: checking for KDE libraries installed" >&5
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-if { (eval echo configure:8063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
+if { (eval echo configure:8067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest; then
echo "$ac_t""yes" 1>&6
else
{ echo "configure: error: your system fails at linking a small KDE
application!
@@ -8151,7 +8155,7 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
echo $ac_n "checking for dcopidl""... $ac_c" 1>&6
-echo "configure:8155: checking for dcopidl" >&5
+echo "configure:8159: checking for dcopidl" >&5
if test -n "$DCOPIDL"; then
kde_cv_path="$DCOPIDL";
else
@@ -8211,7 +8215,7 @@
echo $ac_n "checking for dcopidl2cpp""... $ac_c" 1>&6
-echo "configure:8215: checking for dcopidl2cpp" >&5
+echo "configure:8219: checking for dcopidl2cpp" >&5
if test -n "$DCOPIDL2CPP"; then
kde_cv_path="$DCOPIDL2CPP";
else
@@ -8271,7 +8275,7 @@
echo $ac_n "checking for mcopidl""... $ac_c" 1>&6
-echo "configure:8275: checking for mcopidl" >&5
+echo "configure:8279: checking for mcopidl" >&5
if test -n "$MCOPIDL"; then
kde_cv_path="$MCOPIDL";
else
@@ -8331,7 +8335,7 @@
echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
-echo "configure:8335: checking for artsc-config" >&5
+echo "configure:8339: checking for artsc-config" >&5
if test -n "$ARTSCCONFIG"; then
kde_cv_path="$ARTSCCONFIG";
else
@@ -8391,7 +8395,7 @@
echo $ac_n "checking for kde-config""... $ac_c" 1>&6
-echo "configure:8395: checking for kde-config" >&5
+echo "configure:8399: checking for kde-config" >&5
if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG";
else
@@ -8447,7 +8451,7 @@
echo $ac_n "checking for meinproc""... $ac_c" 1>&6
-echo "configure:8451: checking for meinproc" >&5
+echo "configure:8455: checking for meinproc" >&5
if test -n "$MEINPROC"; then
kde_cv_path="$MEINPROC";
else
@@ -8511,7 +8515,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 8515: $i/$j" >&5
+ echo "configure: 8519: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
@@ -8678,7 +8682,7 @@
for i in $ac_topsubdirs; do
echo $ac_n "checking if $i should be compiled""... $ac_c" 1>&6
-echo "configure:8682: checking if $i should be compiled" >&5
+echo "configure:8686: checking if $i should be compiled" >&5
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
@@ -9058,7 +9062,6 @@
case "$ac_given_INSTALL" in
[/$]*) INSTALL="$ac_given_INSTALL" ;;
-"") ;;
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
@@ -9198,10 +9201,6 @@
exit 0
EOF
-if test "x$with_fast_perl" = "xyes" ; then
- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS || mv
$CONFIG_STATUS.bak $CONFIG_STATUS;
- rm -f $CONFIG_STATUS.bak;
-fi
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
Index: storm/kde/doc/Makefile
diff -u storm/kde/doc/Makefile:1.2 storm/kde/doc/Makefile:1.3
--- storm/kde/doc/Makefile:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/doc/Makefile Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
-# Generated automatically from Makefile.in by config.pl.
-# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
+# Generated automatically from Makefile.in by configure.
+# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -19,7 +19,6 @@
srcdir = .
top_srcdir = ..
-VPATH = .
prefix = /usr
exec_prefix = ${prefix}
#>-
Index: storm/kde/doc/en/Makefile
diff -u storm/kde/doc/en/Makefile:1.2 storm/kde/doc/en/Makefile:1.3
--- storm/kde/doc/en/Makefile:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/doc/en/Makefile Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
-# Generated automatically from Makefile.in by config.pl.
-# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
+# Generated automatically from Makefile.in by configure.
+# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -19,7 +19,6 @@
srcdir = .
top_srcdir = ../..
-VPATH = .
prefix = /usr
exec_prefix = ${prefix}
#>-
Index: storm/kde/kmd/Makefile
diff -u storm/kde/kmd/Makefile:1.2 storm/kde/kmd/Makefile:1.3
--- storm/kde/kmd/Makefile:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/kmd/Makefile Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
-# Generated automatically from Makefile.in by config.pl.
-# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
+# Generated automatically from Makefile.in by configure.
+# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -19,7 +19,6 @@
srcdir = .
top_srcdir = ..
-VPATH = .
prefix = /usr
exec_prefix = ${prefix}
#>-
Index: storm/kde/kmd/kmd.cpp
diff -u storm/kde/kmd/kmd.cpp:1.9 storm/kde/kmd/kmd.cpp:1.10
--- storm/kde/kmd/kmd.cpp:1.9 Wed May 21 16:18:13 2003
+++ storm/kde/kmd/kmd.cpp Wed May 21 20:14:08 2003
@@ -18,6 +18,7 @@
#include <qbitarray.h>
#include <qhttp.h>
#include <qeventloop.h>
+#include <qbuffer.h>
#include <stdlib.h>
@@ -53,6 +54,14 @@
: QObject(), SlaveBase("kio_kmd", pool_socket, app_socket)
{
//kdDebug() << "kio_kmdProtocol::kio_kmdProtocol()" << endl;
+ http = new QHttp();
+ connect(http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
+ this, SLOT(slotResponseHeaderReceived(const QHttpResponseHeader &)));
+ //kdDebug() << "1" << endl;
+ connect(http, SIGNAL(readyRead(const QHttpResponseHeader &)),
+ this, SLOT(slotReadyRead()));
+ connect(http, SIGNAL(requestFinished(int, bool)),
+ this, SLOT(slotRequestFinished(int)));
}
/*
----------------------------------------------------------------------------------
*/
@@ -74,9 +83,58 @@
request(url, 1);
}
+void kio_kmdProtocol::put(const KURL& url, int permissions, bool overwrite,
bool resume)
+{
+ //kdDebug() << "kio_kmdProtocol:: PUT" << endl;
+ QBuffer buf;
+ QByteArray arr;
+
+ buf.open(IO_ReadWrite);
+
+ while(1) {
+ //kdDebug() << "req" << endl;
+ dataReq();
+ //kdDebug() << "read" << endl;
+ int n = readData(arr);
+ //kdDebug() << "read: " << n << endl;
+ if (n > 0) {
+ buf.writeBlock(arr);
+ //kdDebug() << "written" << endl;
+ } else {
+ //kdDebug() << "break" << endl;
+ break;
+ }
+ }
+
+ isFinished = 0;
+ isMimeTypeRequest = 0;
+
+ //kdDebug() << "Buffer size: " << buf.buffer().size() << endl;
+
+ //kdDebug() << "Start HTTP" << endl;
+
+ http->setHost("localhost", 5555);
+ QHttpRequestHeader hdr("PUT", url.prettyURL(), 1, 0);
+ requestNr = http->request(hdr, buf.buffer());
+
+ //kdDebug() << "HTTP initialized, reqnr = " << requestNr << endl;
+
+ while(!isFinished) {
+ //kdDebug() << "process events" << endl;
+ app->processEvents();
+ }
+ //kdDebug() << "done" << endl;
+ finished();
+
+ //kdDebug() << "close" << endl;
+ buf.close();
+ //kdDebug() << "closed" << endl;
+}
+
/* ---------------------------------------------------------------------------
*/
void kio_kmdProtocol::slotResponseHeaderReceived(const QHttpResponseHeader &
resp)
{
+ //kdDebug() << "kio_urn -> response header received" << endl;
if(resp.hasContentType())
mimeType(resp.contentType());
if(isMimeTypeRequest)
@@ -108,16 +166,8 @@
//kdDebug() << "myURL: " << url.prettyURL() << endl;
//kdDebug() << "0" << endl;
- http = new QHttp();
- connect(http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
- this, SLOT(slotResponseHeaderReceived(const QHttpResponseHeader &)));
- //kdDebug() << "1" << endl;
- connect(http, SIGNAL(readyRead(const QHttpResponseHeader &)),
- this, SLOT(slotReadyRead()));
- connect(http, SIGNAL(requestFinished(int, bool)),
- this, SLOT(slotRequestFinished(int)));
//kdDebug() << "2" << endl;
- http->setHost("fishy.it.jyu.fi", 5555);
+ http->setHost("localhost", 5555);
requestNr = http->get(url.prettyURL());
//kdDebug() << "request id: " << requestNr << endl;
while(!isFinished) {
Index: storm/kde/kmd/kmd.h
diff -u storm/kde/kmd/kmd.h:1.5 storm/kde/kmd/kmd.h:1.6
--- storm/kde/kmd/kmd.h:1.5 Wed May 21 16:18:13 2003
+++ storm/kde/kmd/kmd.h Wed May 21 20:14:08 2003
@@ -34,8 +34,11 @@
public:
kio_kmdProtocol(const QCString &pool_socket, const QCString &app_socket);
virtual ~kio_kmdProtocol();
+
virtual void get(const KURL& url);
virtual void mimetype(const KURL& url);
+ virtual void put( const KURL& url, int permissions, bool overwrite, bool
resume );
+
QHttp *http;
QApplication *app;
int requestNr;
Index: storm/kde/kmd/kmd.protocol
diff -u storm/kde/kmd/kmd.protocol:1.2 storm/kde/kmd/kmd.protocol:1.3
--- storm/kde/kmd/kmd.protocol:1.2 Wed May 21 15:55:31 2003
+++ storm/kde/kmd/kmd.protocol Wed May 21 20:14:08 2003
@@ -4,5 +4,6 @@
input=none
output=stream
reading=true
+writing=true
defaultMimetype=text/plain
-Description=A kioslave for kmd
\ No newline at end of file
+Description=A kioslave for Storm
\ No newline at end of file
Index: storm/kde/po/Makefile
diff -u storm/kde/po/Makefile:1.2 storm/kde/po/Makefile:1.3
--- storm/kde/po/Makefile:1.2 Wed May 21 16:28:01 2003
+++ storm/kde/po/Makefile Wed May 21 20:14:08 2003
@@ -1,5 +1,5 @@
-# Generated automatically from Makefile.in by config.pl.
-# KDE tags expanded automatically by am_edit - $Revision: 1.2 $
+# Generated automatically from Makefile.in by configure.
+# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -21,7 +21,6 @@
srcdir = .
top_srcdir = ..
-VPATH = .
prefix = /usr
exec_prefix = ${prefix}
#>-
Index: storm/kde/stamp-h.in
diff -u storm/kde/stamp-h.in:1.1 storm/kde/stamp-h.in:1.2
--- storm/kde/stamp-h.in:1.1 Wed May 21 13:25:11 2003
+++ storm/kde/stamp-h.in Wed May 21 20:14:08 2003
@@ -0,0 +1 @@
+timestamp
Index: storm/org/nongnu/storm/impl/DirDB.java
diff -u storm/org/nongnu/storm/impl/DirDB.java:1.4
storm/org/nongnu/storm/impl/DirDB.java:1.5
--- storm/org/nongnu/storm/impl/DirDB.java:1.4 Sat Apr 19 08:20:30 2003
+++ storm/org/nongnu/storm/impl/DirDB.java Wed May 21 20:14:08 2003
@@ -137,11 +137,16 @@
w.write(m.value);
w.write('\n');
w.close();
+ }
- path = new File(dbDir, "indexed_blocks").getPath();
- os = new FileOutputStream(path, true);
- w = new OutputStreamWriter(os, "UTF-8");
- w.write(m.block.getURI());
+ public void addIndexed(BlockId id) throws IOException {
+ if(getIndexed().contains(id))
+ return;
+
+ String path = new File(dbDir, "indexed_blocks").getPath();
+ OutputStream os = new FileOutputStream(path, true);
+ Writer w = new OutputStreamWriter(os, "UTF-8");
+ w.write(id.getURI());
w.write('\n');
w.close();
}
Index: storm/org/nongnu/storm/impl/DirPool.java
diff -u storm/org/nongnu/storm/impl/DirPool.java:1.5
storm/org/nongnu/storm/impl/DirPool.java:1.6
--- storm/org/nongnu/storm/impl/DirPool.java:1.5 Tue Apr 15 05:33:41 2003
+++ storm/org/nongnu/storm/impl/DirPool.java Wed May 21 20:14:08 2003
@@ -212,6 +212,7 @@
((DirDB)getDB(it)).add(m);
}
+ ((DirDB)getDB(it)).addIndexed(block.getId());
}
}
}
Index: storm/org/nongnu/storm/pointers/PointerIndex.java
diff -u storm/org/nongnu/storm/pointers/PointerIndex.java:1.4
storm/org/nongnu/storm/pointers/PointerIndex.java:1.5
--- storm/org/nongnu/storm/pointers/PointerIndex.java:1.4 Fri May 9
14:35:03 2003
+++ storm/org/nongnu/storm/pointers/PointerIndex.java Wed May 21 20:14:08 2003
@@ -152,7 +152,7 @@
// Mapping "" -> pointer id
// for finding all pointers
mappings.add(new IndexedPool.Mapping(block.getId(), "",
- p.getPointer().toString()));
+ p.getPointer().toString()));
return mappings;
}
Index: storm/org/nongnu/storm/pointers/SetPointer.java
diff -u storm/org/nongnu/storm/pointers/SetPointer.java:1.4
storm/org/nongnu/storm/pointers/SetPointer.java:1.5
--- storm/org/nongnu/storm/pointers/SetPointer.java:1.4 Fri May 9 12:46:25 2003
+++ storm/org/nongnu/storm/pointers/SetPointer.java Wed May 21 20:14:08 2003
@@ -35,14 +35,7 @@
public class SetPointer {
- /** Usage is SetPointer keyfile [pool [pointer] target].
- * If no pointer is given, a new one is generated.
- * If the key file doesn't exist, it's created.
- */
- public static void main(String[] argv) throws Exception {
- System.out.println("Please wait, may need to initialize random number
generator...");
-
- File keyFile = new File(argv[0]);
+ public static KeyPair readKeyPair(File keyFile) throws Exception {
KeyPair keys;
if(keyFile.exists()) {
@@ -58,6 +51,19 @@
out.writeObject(keys);
out.close();
}
+
+ return keys;
+ }
+
+ /** Usage is SetPointer keyfile [pool [pointer] target].
+ * If no pointer is given, a new one is generated.
+ * If the key file doesn't exist, it's created.
+ */
+ public static void main(String[] argv) throws Exception {
+ System.out.println("Please wait, may need to initialize random number
generator...");
+
+ File keyFile = new File(argv[0]);
+ KeyPair keys = readKeyPair(keyFile);
if(argv.length == 1) {
PointerId pointer = new PointerId(keys.getPublic());
Index: storm/org/nongnu/storm/util/HTTPProxy.java
diff -u storm/org/nongnu/storm/util/HTTPProxy.java:1.32
storm/org/nongnu/storm/util/HTTPProxy.java:1.33
--- storm/org/nongnu/storm/util/HTTPProxy.java:1.32 Wed May 21 17:09:28 2003
+++ storm/org/nongnu/storm/util/HTTPProxy.java Wed May 21 20:14:08 2003
@@ -36,12 +36,13 @@
import java.net.*;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.security.*;
/** An HTTP server serving blocks from a Storm pool. When started from command
* line, it servers the directory given as first argument.
*/
public class HTTPProxy implements Runnable {
- public static boolean dbg = false;
+ public static boolean dbg = true;
private static void p(String s) { System.out.println("HTTPProxy: "+s); }
protected IndexedPool pool;
@@ -52,6 +53,9 @@
protected String URNPAC;
protected String BACKLINKS;
protected HTTPServer server;
+
+ protected boolean acceptPut = false;
+ protected KeyPair keyPair;
public HTTPProxy(IndexedPool pool, int port) throws IOException {
this.pool = pool;
@@ -65,6 +69,16 @@
this.server = new HTTPServer(new Factory(), port);
}
+ /** Construct a gateway that allows PUT to pointer URNs.
+ * Needs to be passed the key pair to sign the URNs.
+ */
+ public HTTPProxy(IndexedPool pool, int port,
+ KeyPair keyPair) throws IOException {
+ this(pool, port);
+ this.acceptPut = true;
+ this.keyPair = keyPair;
+ }
+
public void run() {
if(dbg) p("Starting Storm URN server @ "+ROOTURL);
server.run();
@@ -331,6 +345,61 @@
w.close();
return resp;
}
+
+ protected HTTPResponse doPut(HTTPRequest req, HTTPResponse.Factory
resf)
+ throws IOException {
+
+ String uri = req.getRequestURI();
+ System.out.println("PUT: "+uri);
+
+ if(!acceptPut)
+ return doUnknown(req, resf);
+
+ if(dbg) p("PUT accepted");
+ PointerId id = new PointerId(uri);
+ PointerIndex idx =
+ (PointerIndex)pool.getIndex(PointerIndex.uri);
+ BlockId current;
+
+ try {
+ current = idx.get(id);
+ } catch(Exception _) {
+ _.printStackTrace();
+ throw new Error("Exception while getting key XXX");
+ }
+
+ if(dbg) p("Got old pointer value");
+
+ // because we don't get a content-type
+ // assume it's the same as before
+ BlockOutputStream bos =
+ pool.getBlockOutputStream(current.getContentType());
+
+ CopyUtil.copy(req.getInputStream(), bos);
+
+ if(dbg) p("Created new block: "+bos.getBlockId());
+
+ try {
+ idx.set(id, bos.getBlockId(), keyPair);
+ } catch(Exception _) {
+ _.printStackTrace();
+ throw new Error("Exception while getting key XXX");
+ }
+
+ if(dbg) p("Set pointer, making response.");
+
+ HTTPResponse resp = resf.makeResponse(200, "Ok");
+ resp.setField("Content-Type", "text/html");
+ Writer w = new OutputStreamWriter(resp.getOutputStream(),
+ "US-ASCII");
+ w.write("<html><head><title>Ok</title></head><body>");
+ w.write("PUT was successful, new block is: "+bos.getBlockId());
+ w.write("</body></html>");
+ w.close();
+
+ if(dbg) p("Return response");
+ return resp;
+ }
}
protected BlockId getBlockId(String uri) {
@@ -364,6 +433,11 @@
java.util.Collections.singleton(PointerIndex.type);
pool = new DirPool(new File(args[0]), indexTypes);
- new HTTPProxy(pool, 5555).run();
+ if(args.length == 1)
+ new HTTPProxy(pool, 5555).run();
+ else {
+ KeyPair keys = SetPointer.readKeyPair(new File(args[1]));
+ new HTTPProxy(pool, 5555, keys).run();
+ }
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] storm ./Makefile kde/Makefile kde/Makefile.in k...,
Benja Fallenstein <=