X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=f68796e8440a4030bdb09f8daf63d44b134720cc;hb=385de86d903c95e9897bd106b04e3ef1f70d9d2d;hp=0690227646b9e95d478d78ac05258b6d9b76cef7;hpb=951ccd15a93c6fe1c0910181781b9a87effd195a;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 06902276..f68796e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
 AC_PREREQ([2.50])
 
+test "$prefix" = "NONE" && prefix="$ac_default_prefix"
+    
 AC_PATH_PROG([regex_cmd], [sed])
 test "$regex_cmd" || AC_MSG_ERROR([sed not found])
 
@@ -77,7 +79,7 @@ CXXFLAGS="$CXXFLAGS $DEBUG"
 
 # Check for Python
 AC_ARG_WITH([python],
-	[  --with-python=path       Set location of Python executable],
+	[  --with-python=path      Set location of Python executable],
 	[PYTHON="$withval"],
 	[PYTHON=])
 
@@ -121,28 +123,38 @@ else
   AC_MSG_RESULT([$PYTHON_CFLAGS])
 fi
 
-# Set the library directory blindly.   This probably won't work with older versions
+# Find the python library
+PYTHON_LIBS=""
 AC_MSG_CHECKING([for Python library])
-dirs="$PYVERSION/config $PYVERSION/lib python/lib"
+dirs="$PYEPREFIX/lib $PYEPREFIX/lib/$PYVERSION/config \
+      $PYEPREFIX/lib/$PYVERSION/lib $PYEPREFIX/lib/python/lib"
 for i in $dirs; do
-  if test -d "$PYEPREFIX/lib/$i"; then
-    PYLIB="$PYEPREFIX/lib/$i"
-    break
+  # look for really old versions
+  if test -r "$i/lib$PYVERSION.so"; then
+      PYLIB="$i"
+      PYTHON_LIBS="-L$PYLIB -l$PYVERSION"
+      break
+  else
+    if test -r "$i/libPython.a"; then
+      PYLIB="$i"
+      PYTHON_LIBS="-L$PYLIB -lModules -lPython -lObjects -lParser"
+      break
+    else
+      if test -r "$i/lib$PYVERSION.a"; then
+        PYLIB="$i"
+        PYTHON_LIBS="-L$PYLIB -l$PYVERSION -lpthread -ldl -lutil -lm"
+        break
+      fi
+    fi
   fi
 done
+
 if ! test "$PYLIB"; then
   AC_MSG_ERROR([Not found])
 else
   AC_MSG_RESULT([$PYLIB])
 fi
 
-# Check for really old versions
-if test -r "$PYLIB/libPython.a"; then
-    PYTHON_LIBS="-L$PYLIB -lModules -lPython -lObjects -lParser"
-else
-    PYTHON_LIBS="-L$PYLIB -l$PYVERSION"
-fi
-
 AC_SUBST([PYTHON_CFLAGS])
 AC_SUBST([PYTHON_LIBS])
 
@@ -375,6 +387,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in
 		doc/Makefile
 		doc/doxygen/Makefile
 		data/Makefile
+		data/buttons/Makefile
 		data/styles/Makefile
 		version.h
 		])