michael@22: Index: src/Makefile.in
michael@22: --- src/Makefile.in.orig	2004-05-27 23:29:46 +0200
michael@22: +++ src/Makefile.in	2005-04-21 21:58:27 +0200
michael@22: @@ -197,7 +197,7 @@
michael@22:  
michael@22:  
michael@22:  aqmoney2_LDADD = \
michael@22: -  @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
michael@22: +  modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
michael@22:  
michael@22:  aqmoney2_SOURCES = \
michael@22:   aqmauth.cpp \
michael@22: @@ -206,7 +206,7 @@
michael@22:  
michael@22:  
michael@22:  qtest_LDADD = \
michael@22: -  @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
michael@22: +  modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
michael@22:  
michael@22:  
michael@22:  qtest_SOURCES = qtest.cpp
michael@22: Index: src/libaqmoney/converter/oldconf.c
michael@22: --- src/libaqmoney/converter/oldconf.c.orig	2004-01-25 19:51:29 +0100
michael@22: +++ src/libaqmoney/converter/oldconf.c	2005-04-21 21:34:14 +0200
michael@22: @@ -642,7 +642,7 @@
michael@22:    assert(root);
michael@22:    assert(path);
michael@22:    DBG_VERBOUS(0, "GetValue for \"%s\"",path);
michael@22: -  var=ConfigOld__GetPath(root,path,
michael@22: +  var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(root,path,
michael@22:  		      CONFIGOLDMODE_PATHMUSTEXIST |
michael@22:  		      CONFIGOLDMODE_NAMEMUSTEXIST |
michael@22:  		      CONFIGOLDMODE_VARIABLE);
michael@22: @@ -945,7 +945,7 @@
michael@22:        }
michael@22:        *p=0;
michael@22:        DBG_VERBOUS(0, "Selecting group \"%s\"",name);
michael@22: -      grp=ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
michael@22: +      grp=(CONFIGOLDGROUP *)ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
michael@22:        if (!grp) {
michael@22:  	DBG_DEBUG(0, "Group \"%s\" is not available",name);
michael@22:  	return 0;
michael@22: @@ -1017,7 +1017,7 @@
michael@22:  
michael@22:    DBG_VERBOUS(0, "Creating variable \"%s\"",np);
michael@22:    if (mode & CONFIGOLDMODE_ALLOW_PATH_IN_VARS)
michael@22: -    var=ConfigOld__GetPath(group,
michael@22: +    var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(group,
michael@22:  			np,
michael@22:  			mode|CONFIGOLDMODE_VARIABLE);
michael@22:    else {
michael@22: Index: configure
michael@22: --- configure.orig	2004-05-27 23:29:51 +0200
michael@22: +++ configure	2005-04-22 11:16:30 +0200
michael@22: @@ -21333,7 +21333,7 @@
michael@22:  
michael@22:    if test -n "$found_file" ; then
michael@22:       ktoblzcheck_libraries="-L$d"
michael@22: -     ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//'`"
michael@22: +     ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//;s/\\.la//'`"
michael@22:       break
michael@22:    fi
michael@22:  done