Get rid of version.in - forgotten files

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 56dd35a759bee5533d1572d7e5dad17d8b4fc108..3c8a5f5fcf4bd3dfd4cb54c30a28d28c9b1b8c43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,10 @@ if test \( -d .git \); then
        AC_MSG_ERROR([*** git not found. See http://git-scm.com/])
     else
        GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+       echo "echo ${GIT_VERSION}" > ./version
     fi
 else
-    GIT_VERSION=`sh -c '. ./version'`
+    GIT_VERSION=`sh -c ". ./$srcdir/version"`
 fi
 MAJOR_VERSION=${GIT_VERSION%%.*}
 MINOR_VERSION=${GIT_VERSION#*.}
@@ -1240,7 +1241,15 @@ AM_PATH_PYTHON([2.5], [
                PYTHON_SO_FILE_LOCATION=`python-config --ldflags|sed 's/-L//'|awk '{print $1}'`
                PYTHON_SO_FILE="libpython${PYTHON_VERSION}.so"
                found_libpython_so="no"
-               if test -f "$PYTHON_SO_FILE_LOCATION/$PYTHON_SO_FILE"; then
+               if test -f "$PYTHON_PREFIX/lib/$PYTHON_SO_FILE"; then
+                       found_libpython_so="yes"
+                       PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib/$PYTHON_SO_FILE\"))"`
+               fi
+               if  test x"$found_libpython_so" != x"yes" && test -f "$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE"; then
+                       found_libpython_so="yes"
+                       PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE\"))"`
+               fi
+               if test x"$found_libpython_so" != x"yes" && test -f "$PYTHON_SO_FILE_LOCATION/$PYTHON_SO_FILE"; then
                        found_libpython_so="yes"
                        PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_SO_FILE_LOCATION/$PYTHON_SO_FILE\"))"`
                fi
@@ -1961,7 +1970,6 @@ manual/de/dist/ps/Makefile
 manual/de/dist/html/Makefile
 manual/de/dist/txt/Makefile
 claws-mail.pc
-version
 ])
 
 dnl Output the configuration summary