--- configure.orig	2014-01-27 04:04:34.000000000 +0100
+++ configure	2014-01-29 13:12:46.268622841 +0100
@@ -16216,7 +16216,7 @@
                DATADIRNAME=share
 else
   CATOBJEXT=.mo
-               DATADIRNAME=lib
+               DATADIRNAME=share
 fi
 
 	    ;;
@@ -16226,7 +16226,7 @@
 	    ;;
 	    *)
 	    CATOBJEXT=.mo
-            DATADIRNAME=lib
+            DATADIRNAME=share
 	    ;;
 	    esac
 fi
@@ -16914,12 +16914,12 @@
 if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   DATADIRNAME=share
 else
-  DATADIRNAME=lib
+  DATADIRNAME=share
 fi
 
     ;;
     *)
-    DATADIRNAME=lib
+    DATADIRNAME=share
     ;;
     esac
 fi
@@ -17612,8 +17612,8 @@
   THREAD_LIBS=""
 fi
 
-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
-AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
+AMIDE_LIBDCMDATA_LIBS="-L%%LOCALBASE%%/lib -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
+AMIDE_LIBDCMDATA_CFLAGS="-I%%LOCALBASE%%/include"
 saved_libs="${LIBS}"
 LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
 saved_cxxflags="${CXXFLAGS}"
@@ -18154,6 +18154,7 @@
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
+      CXXFLAGS="$CFLAGS $LIBFAME_CFLAGS"
       LIBS="$LIBFAME_LIBS $LIBS"
       rm -f conf.libfametest
       if test "$cross_compiling" = yes; then :
@@ -18165,6 +18166,7 @@
 #include <fame.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int
 main ()