Sophie

Sophie

distrib > Mandriva > 2008.1 > i586 > by-pkgid > b7faf3d448e873866114b64305612188 > files > 1

kphone-4.2-9mdv2008.1.src.rpm

--- kphone/configure.in--	2004-11-19 10:45:15.054470687 +0100
+++ kphone/configure.in	2004-11-19 10:48:03.263325718 +0100
@@ -10,6 +10,41 @@ AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_GCC_TRADITIONAL
 
+
+dnl Check for lib64 dir name
+AC_DEFUN([KPHONE_CHECK_LIBNAME], [
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+  AC_MSG_CHECKING([libdir name])
+  case $host in
+  *-*-linux*)
+    # Test if the compiler is 64bit
+    echo 'int i;' > conftest.$ac_ext
+    kphone_cv_cc_64bit_output=no
+    if AC_TRY_EVAL(ac_compile); then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *"ELF 64"*)
+        kphone_cv_cc_64bit_output=yes
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
+  case $host_cpu:$kphone_cv_cc_64bit_output in
+  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+    LIB="lib64"
+    ;;
+  *:*)
+    LIB="lib"
+    ;;
+  esac
+  AC_MSG_RESULT([$LIB])
+])
+KPHONE_CHECK_LIBNAME
+
+
 dnl Check for Qt preprocessor 'moc'
 AC_PATH_PROG(MOC, moc, /usr/local/bin/moc, $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin::/usr/lib/qt3/bin:/usr/local/qt/bin:/usr/share/qt3/bin)
 
@@ -42,7 +77,7 @@ fi
 dnl Look for Qt library files
 AC_CACHE_CHECK(location of Qt library,
   ac_cv_qt_lib, [
-  for T in $QTDIR/lib $QTDIR /usr/lib/qt3 /usr/lib/qt3/lib64 /usr/lib/qt3/lib /usr/local/lib/qt /usr/share/qt3/lib /usr/lib; do
+  for T in $QTDIR/$LIB $QTDIR /usr/lib/qt3 /usr/lib/qt3/$LIB /usr/lib/qt3/lib /usr/local/lib/qt /usr/share/qt3/$LIB /usr/$LIB; do
      if test "x$ac_cv_qt_lib" = "x"; then
        if test -f $T/libqt-mt.so -o -f $T/libqt-mt.a; then
          ac_cv_qt_lib=$T;
@@ -90,7 +125,7 @@ if test "$ac_cv_qt_mt" = "yes"; then
 fi
 
 CFLAGS="-I$ac_cv_qt_inc -Wall"
-LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
+LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/X11R6/$LIB"
 
 dnl Check for X libraries.
 AC_LANG_C