Am Mittwoch, 31. Mai 2006 21:02 schrieb Lars Gullik Bjønnes: > > To be able to build out-of-the-bos on fc5 with the qt4 from extras I > have to do something similar to:
Yep, the qt4 config stuff is not 100% foolproof yet. > Index: qt.m4 > =================================================================== > --- qt.m4 (revision 13974) > +++ qt.m4 (working copy) > @@ -443,6 +443,9 @@ > > dnl pay attention to $QT4DIR unless overridden > if test -z "$qt4_cv_dir"; then > + if test -z "$QT4DIR"; then > + QT4DIR=/usr/lib/qt4 > + fi > qt4_cv_dir=$QT4DIR > fi > > To have it compile without and other intervention. > > Should I just commit this? I'd rather like the attached, since there does not seem to be an agreement between distros where to put qt4. Georg
Index: config/qt.m4 =================================================================== --- config/qt.m4 (Revision 13974) +++ config/qt.m4 (Arbeitskopie) @@ -443,7 +443,17 @@ AC_DEFUN([QT4_DO_IT_ALL], dnl pay attention to $QT4DIR unless overridden if test -z "$qt4_cv_dir"; then - qt4_cv_dir=$QT4DIR + if test -z "$QT4DIR"; then + for i in /usr/lib/qt4 /usr/share/qt4; do + dnl test -e because the dir could be a symlink + if test -e $i/include; then + qt4_cv_dir=$i + break + fi + done + else + qt4_cv_dir=$QT4DIR + fi fi dnl derive inc/lib if needed
