refs #22

swisssurfer/configure.in

@@ -1,24 +1,32 @@
 # init
 AC_INIT([README])
-PACKAGENAME=swisssurfer
 SRC_DIR=src
 TST_DIR=
 DOC_DIR=doc
 
+m4_define(x_packagename, swisssurfer)
 m4_define(x_major, 1)
 m4_define(x_minor, 0)
-m4_define(x_least, 0)
-AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
+
+PACKAGENAME=x_packagename
+MAJOR=x_major
+MINOR=x_minor
+
+LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+for path in . .. ../..; do
+  if svn info $path 2>&1 > /dev/null; then
+    LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p')
+    break;
+  fi
+done
+
+AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
 
 # files to create
 AC_CONFIG_FILES(makefile
                 src/makefile src/qmake.pro src/languages.qrc
                 doc/doxyfile doc/makefile)
 
-# copy M4 to shell
-MAJOR=x_major
-MINOR=x_minor
-LEAST=x_least
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(LEAST)

swisssurfer/doc/makefile.am

@@ -5,8 +5,8 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-#develdir = ${pkgdatadir}/doc/devel
-#devel_DATA = devel/index.html
+develdir = ${pkgdatadir}/doc
+devel_DATA = html/index.html
 
 ALL_SRC = ${top_srcdir}/src/*.[ch]xx
 # ${top_srcdir}/src/*.doc
@@ -21,7 +21,7 @@ all: ${DIRS}
 deps = ${top_srcdir}/COPYING ${top_srcdir}/README		 \
        ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
 
-html: ${ALL_SRC} doxyfile ${deps}
+${devel_DATA}: ${ALL_SRC} doxyfile ${deps}
 	doxygen doxyfile
 if PEDANTIC
 	test \! -s doxygen.errors
@@ -36,13 +36,13 @@ MAINTAINERCLEANFILES = makefile.in
 distclean-local:
 	- rm -r html latex
 
-#dist-hook:
-#	cp html/* ${develdir}
+dist-hook: ${devel_DATA}
+	cp -r html ${distdir}/
 
-#install-data-hook:
-#	chmod -R u+w ${pkgdatadir}/doc
-#	cp devel/* ${develdir}
+install-data-hook:
+	chmod -R u+w ${develdir}
+	cp -r html/* ${develdir}/
 
-#uninstall-hook:
-#	chmod -R u+w ${pkgdatadir}/doc
-#	rm -rf ${develdir}
+uninstall-hook:
+	-chmod -R u+w ${develdir}
+	-rm -rf ${develdir}/*

swisssurfer/src/makefile.am

@@ -17,6 +17,9 @@ QMAKE_TARGET = @PACKAGENAME@
 
 TARGETS = ${QMAKE_TARGET}
 
+EXTRA_SCRIPTS= swisssurfer
+bin_SCRIPTS = ${EXTRA_SCRIPTS}
+
 if BUILD_WIN
   QMAKE_MAKEFILE_WIN = makefile.win.qmake
   QMAKE_OPTIONS_WIN = ${QMAKE_OPTIONS} -win32 -spec cross-mingw-g++

swisssurfer/src/smartcardauth.cxx

@@ -58,6 +58,7 @@ SmartCardAuth::~SmartCardAuth() {
 std::map<ssl_ctx_st*, QSslSocket*> sockets;
 
 int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
+  if (!e) return 0;
   static std::set<QString> allowedUrls;
   std::map<ssl_ctx_st*, QSslSocket*>::iterator it(sockets.find(ssl->ctx));
   if (it!=sockets.end()) {
@@ -153,6 +154,7 @@ int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
 void SmartCardAuth::extendedContextInitialization(ssl_ctx_st *ctx,
                                                   QSslSocket *socket)
 {    
+  if (!e) return;
     bool result = false;
 
     if(!certs_found)

swisssurfer/src/swisssurfer_de.ts

@@ -505,12 +505,12 @@ Try: %1 --help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="65"/>
+        <location filename="smartcardauth.cxx" line="66"/>
         <source>Send Authentication?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="66"/>
+        <location filename="smartcardauth.cxx" line="67"/>
         <source>Do you want to authenticate yourself to %1?</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_en.ts

@@ -505,12 +505,12 @@ Try: %1 --help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="65"/>
+        <location filename="smartcardauth.cxx" line="66"/>
         <source>Send Authentication?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="66"/>
+        <location filename="smartcardauth.cxx" line="67"/>
         <source>Do you want to authenticate yourself to %1?</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_fr.ts

@@ -505,12 +505,12 @@ Try: %1 --help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="65"/>
+        <location filename="smartcardauth.cxx" line="66"/>
         <source>Send Authentication?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="66"/>
+        <location filename="smartcardauth.cxx" line="67"/>
         <source>Do you want to authenticate yourself to %1?</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_it.ts

@@ -505,12 +505,12 @@ Try: %1 --help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="65"/>
+        <location filename="smartcardauth.cxx" line="66"/>
         <source>Send Authentication?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.cxx" line="66"/>
+        <location filename="smartcardauth.cxx" line="67"/>
         <source>Do you want to authenticate yourself to %1?</source>
         <translation type="unfinished"></translation>
     </message>