Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > b664a3b7afda5fc82625a0c5d3cf7b27 > files > 1

ogle_gui-0.9.2-3mdv2007.0.src.rpm

--- ./configure.in.ogle-lib64	2003-11-05 21:46:13.000000000 +0100
+++ ./configure.in	2006-08-10 01:34:17.742629131 +0200
@@ -7,6 +7,7 @@
 AM_MAINTAINER_MODE
 
 dnl Check that ogle is installed in the prefix, this is needed
+if test "x${libdir}" = "xNONE"; then
 if test "x${exec_prefix}" = "xNONE"; then
   if test "x${prefix}" = "xNONE"; then
     ogle_pkglibdir=${ac_default_prefix}/lib/ogle
@@ -16,6 +17,9 @@
 else
   ogle_pkglibdir=${exec_prefix}/lib/ogle
 fi
+else
+  ogle_pkglibdir=${libdir}/ogle
+fi
 
 AC_MSG_CHECKING(for ogle helper dir)
 if test ! -x ${ogle_pkglibdir}/ogle_ctrl; then
@@ -82,24 +86,24 @@
     dvd_path=$withval
   fi)
 if test -z "$dvd_path"; then
-  dnl We have nothing better to go on, guess that it's installed in prefix
-  if test "x$prefix" != xNONE; then
-    dvd_path=$prefix
+  dnl We have nothing better to go on, guess that it's installed in libdir
+  if test "x$libdir" != xNONE; then
+    dvd_path=$libdir
   else
     dvd_path=$ac_default_prefix
   fi  
 fi
 
 AC_CHECK_LIB(dvdcontrol, DVDRequestInput, 
-  [ DVDLIBS="-L$dvd_path/lib/ogle -rpath $dvd_path/lib/ogle -ldvdcontrol" 
-    DVD_INCLUDEDIR=-I$dvd_path/include
+  [ DVDLIBS="-L$dvd_path/ogle -rpath $dvd_path/ogle -ldvdcontrol" 
+    DVD_INCLUDEDIR=-I$prefix/include
   ],
   [ AC_MSG_ERROR([
 * Need "libdvdcontrol.so", it's part of Ogle(-devel).
 * Install it and/or specify the location for it using --with-dvdcontrol=DIR.
 * For example ... --with-dvdcontrol=/usr/local ] )
   ],
-  -L$dvd_path/lib/ogle -lmsgevents)
+  -L$dvd_path/ogle -lmsgevents)
 AC_SUBST(DVDLIBS)
 
 AC_ARG_WITH(dvd-includes,