Re: qt4 - config/qt.m4

2006-06-03 Thread Georg Baum
Am Freitag, 2. Juni 2006 23:05 schrieb Lars Gullik Bjønnes:
> Georg Baum <[EMAIL PROTECTED]> writes:
> | Lars, does it work for you? Can it go in?

Did you try?
 
> You are aware of the pgk.m4 packages?

Yes. I used it in the patch.

> It can be used for pkg-config queries. Is it usable for us?

With a little quirk, yes. It sets the QT4_CFLAGS variable, but we want 
QT4_INCLUDES, so I did

QT4_INCLUDES="$QT4_CFLAGS"

> (Already used by gtk I think?)

Yes.


Georg



Re: qt4 - config/qt.m4

2006-06-02 Thread Lars Gullik Bjønnes
Georg Baum <[EMAIL PROTECTED]> writes:

| Am Donnerstag, 1. Juni 2006 12:10 schrieb Jean-Marc Lasgouttes:
| > > "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
| > 
| > Georg> I think it would be possible, but not easier than tweaking
| > Georg> qt.m4. 
| > 
| > Getting rid of AC_PATH_EXTRA (just keep it for xforms) would be nice...
| 
| That is not used in qt.m4. Could you explain what you mean?
| 
| > Georg> And I can understand Lars' desire to use configure without
| > Georg> flags, but I don't think we need to do that for all possible
| > Georg> configurations, only the mainstream ones.
| > 
| > Agreed. We should not hardcode this stuff.
| 
| Here comes the next try. Changes:
| - Search also moc4 and uic4
| - Check version of moc and uic
| - use pkg-config if available and no qt dir was given
| 
| Lars, does it work for you? Can it go in?

You are aware of the pgk.m4 packages?
It can be used for pkg-config queries. Is it usable for us?
(Already used by gtk I think?)

-- 
Lgb



Re: qt4 - config/qt.m4

2006-06-02 Thread Georg Baum
Am Donnerstag, 1. Juni 2006 12:10 schrieb Jean-Marc Lasgouttes:
> > "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
> 
> Georg> I think it would be possible, but not easier than tweaking
> Georg> qt.m4. 
> 
> Getting rid of AC_PATH_EXTRA (just keep it for xforms) would be nice...

That is not used in qt.m4. Could you explain what you mean?

> Georg> And I can understand Lars' desire to use configure without
> Georg> flags, but I don't think we need to do that for all possible
> Georg> configurations, only the mainstream ones.
> 
> Agreed. We should not hardcode this stuff.

Here comes the next try. Changes:
- Search also moc4 and uic4
- Check version of moc and uic
- use pkg-config if available and no qt dir was given

Lars, does it work for you? Can it go in?


Georg
Index: config/qt.m4
===
--- config/qt.m4	(Revision 13983)
+++ config/qt.m4	(Arbeitskopie)
@@ -328,7 +328,15 @@ AC_DEFUN([QT4_FIND_PATH],
 dnl Find the uic compiler on the path or in qt_cv_dir
 AC_DEFUN([QT_FIND_UIC4],
 [
-	QT4_FIND_PATH(uic, ac_uic4, $qt4_cv_dir/bin)
+	QT4_FIND_PATH(uic4, ac_uic4, $qt4_cv_dir/bin)
+	if test -z "$ac_uic4"; then
+		QT4_FIND_PATH(uic, ac_uic4, $qt4_cv_dir/bin)
+	fi
+
+	dnl test the version
+	if test -n "$ac_uic4" && ! "$ac_uic4" -version 2>&1 | grep "Qt user interface compiler 4" >/dev/null; then
+		ac_uic4=""
+	fi
 
 	if test -z "$ac_uic4" -a "$FATAL" = 1; then
 		AC_MSG_ERROR([uic 4 binary not found in \$PATH or $qt4_cv_dir/bin !])
@@ -338,7 +346,15 @@ AC_DEFUN([QT_FIND_UIC4],
 dnl Find the right moc in path/qt_cv_dir
 AC_DEFUN([QT_FIND_MOC4],
 [
-	QT4_FIND_PATH(moc, ac_moc4, $qt4_cv_dir/bin)
+	QT4_FIND_PATH(moc4, ac_moc4, $qt4_cv_dir/bin)
+	if test -z "$ac_moc4"; then
+		QT4_FIND_PATH(moc, ac_moc4, $qt4_cv_dir/bin)
+	fi
+
+	dnl test the version
+	if test -n "$ac_moc4" && ! "$ac_moc4" -v 2>&1 | grep "Qt 4" >/dev/null; then
+		ac_moc4=""
+	fi
 
 	if test -z "$ac_moc4"  -a "$FATAL" = 1; then
 		AC_MSG_ERROR([moc 4 binary not found in \$PATH or $qt4_cv_dir/bin !])
@@ -449,16 +465,26 @@ AC_DEFUN([QT4_DO_IT_ALL],
 	dnl derive inc/lib if needed
 	if test -n "$qt4_cv_dir"; then
 		if test -z "$qt4_cv_includes"; then
-			qt4_cv_includes=$qt4_cv_dir/include
+			qt4_cv_includes="$qt4_cv_dir/include"
 		fi
 		if test -z "$qt4_cv_libraries"; then
-			qt4_cv_libraries=$qt4_cv_dir/lib
+			qt4_cv_libraries="$qt4_cv_dir/lib"
 		fi
 	fi
 
 	dnl flags for compilation
 	QT4_INCLUDES=
 	QT4_LDFLAGS=
+	dnl try pkg-config if we don't know the qt dir
+	if test -z "$qt4_cv_includes" -o -z "$qt4_cv_libraries"; then
+		if test -z "$PKG_CONFIG"; then
+			AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+		fi
+		if test -n "$PKG_CONFIG"; then
+			PKG_CHECK_MODULES(QT4, QtCore QtGui)
+			QT4_INCLUDES="$QT4_CFLAGS"
+		fi
+	fi
 	if test -n "$qt4_cv_includes"; then
 		QT4_INCLUDES="-I$qt4_cv_includes"
 		for i in Qt QtCore QtGui; do
@@ -480,12 +506,12 @@ AC_DEFUN([QT4_DO_IT_ALL],
 
 	if test -z "$MOC4"; then
 		QT_FIND_MOC4
-		MOC4=$ac_moc4
+		MOC4="$ac_moc4"
 	fi
 	AC_SUBST(MOC4)
 	if test -z "$UIC4"; then
 		QT_FIND_UIC4
-		UIC4=$ac_uic4
+		UIC4="$ac_uic4"
 	fi
 	AC_SUBST(UIC4)
 


Re: qt4 - config/qt.m4

2006-06-01 Thread Enrico Forestieri
On Thu, Jun 01, 2006 at 03:00:41PM +0200, Abdelrazak Younes wrote:
> Jean-Marc Lasgouttes wrote:
> >>"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:
> >
> >Abdelrazak> A... you mean the windows api libraries. They are not
> >Abdelrazak> distributed with Qt. They are part of mingw (w32api
> >Abdelrazak> package IIRC). 
> >
> >But do we have to explicitely link against them?
> 
> If you link dynamically against Qt then you only need "-lgdi32 
> -lshlwapi"  but I don't think it is because of Qt (this dependency came 
> only recently).
> If you link statically against Qt (like Enrico with cygwin) then you 
> need the full monty yes.

This is with mingw, too. However, using libtool on cygwin solves the
problem, whereas this is not the case with mingw.

-- 
Enrico


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:


Abdelrazak> A... you mean the windows api libraries. They are not
Abdelrazak> distributed with Qt. They are part of mingw (w32api
Abdelrazak> package IIRC). 


But do we have to explicitely link against them?


If you link dynamically against Qt then you only need "-lgdi32 
-lshlwapi"  but I don't think it is because of Qt (this dependency came 
only recently).
If you link statically against Qt (like Enrico with cygwin) then you 
need the full monty yes.


Abdel.



JMarc





Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:

Abdelrazak> A... you mean the windows api libraries. They are not
Abdelrazak> distributed with Qt. They are part of mingw (w32api
Abdelrazak> package IIRC). 

But do we have to explicitely link against them?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:



Abdelrazak> I don't understand. On Unix, it should be this path plus:
Abdelrazak> libQtCore.a libQtGui.a

Abdelrazak> On Windows/Mingw, it is: libQtCore4.a libQtGui4.a

Abdelrazak> On Windows/MSVC, it is: QtCore4.lib QtGui4.lib

And no strange windows libraries?
  


A... you mean the windows api libraries. They are not distributed 
with Qt. They are part of mingw (w32api package IIRC). I guess we should 
have a configure test for "w32api.h" if that is not already the case. As 
a side note the Qt installation program check for this file.


Abdel.



JMarc


  




Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:

Abdelrazak> I don't understand. On Unix, it should be this path plus:
Abdelrazak> libQtCore.a libQtGui.a

Abdelrazak> On Windows/Mingw, it is: libQtCore4.a libQtGui4.a

Abdelrazak> On Windows/MSVC, it is: QtCore4.lib QtGui4.lib

And no strange windows libraries?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:


Abdelrazak> 4.0 is deprected, use 4.1 instead:

Abdelrazak> http://doc.trolltech.com/4.1/qmake-environment-reference.html

Sure, but I do not see a reason to refer to 4.1 doc if 4.0 is the same :)


Indeed, I did not check. Just wanted to warn you because I've been 
bitten by this once.



Abdelrazak> It works with official Qt/Mingw:

Abdelrazak> D:\program\Qt\4.1.3\bin>.\qmake -query QT_INSTALL_LIBS
Abdelrazak> d:\program\Qt\4.1.3\lib

This one is not the most interesting. What about libraries to link against?


I don't understand. On Unix, it should be this path plus:
libQtCore.a
libQtGui.a

On Windows/Mingw, it is:
libQtCore4.a
libQtGui4.a

On Windows/MSVC, it is:
QtCore4.lib
QtGui4.lib

Abdel.





JMarc





Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:

Georg> I think it would be possible, but not easier than tweaking
Georg> qt.m4. 

Getting rid of AC_PATH_EXTRA (just keep it for xforms) would be nice...

Georg> And I can understand Lars' desire to use configure without
Georg> flags, but I don't think we need to do that for all possible
Georg> configurations, only the mainstream ones.

Agreed. We should not hardcode this stuff.

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:

Abdelrazak> 4.0 is deprected, use 4.1 instead:

Abdelrazak> http://doc.trolltech.com/4.1/qmake-environment-reference.html

Sure, but I do not see a reason to refer to 4.1 doc if 4.0 is the same :)

Abdelrazak> It works with official Qt/Mingw:

Abdelrazak> D:\program\Qt\4.1.3\bin>.\qmake -query QT_INSTALL_LIBS
Abdelrazak> d:\program\Qt\4.1.3\lib

This one is not the most interesting. What about libraries to link against?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Peter" == Peter Kümmel <[EMAIL PROTECTED]> writes:


Peter> I've not followed the thread but maybe this is what you are
Peter> looking for:

Peter> qmake -query QT_INSTALL_LIBS 


This is not described by qmake help, it would be too easy! I finally
found it in my qt3.3 manual, but I can only use 


* QT_INSTALL_PREFIX - Where the version of Qt this qmake is built
  for resides 
* QT_INSTALL_DATA - Where data for this version of Qt resides

* QMAKE_VERSION - The current version of qmake

See for example:
http://doc.trolltech.com/4.0/qmake-environment-reference.html


4.0 is deprected, use 4.1 instead:

http://doc.trolltech.com/4.1/qmake-environment-reference.html


This is not very useful.

So it seems that your copy of qt has additional settings configured.
Is that something we can rely on?


It works with official Qt/Mingw:

D:\program\Qt\4.1.3\bin>.\qmake -query QT_INSTALL_LIBS
d:\program\Qt\4.1.3\lib

and with locally compiled Qt/MSVC:

D:\program\Qt\4.1\bin>.\qmake.exe -query QT_INSTALL_LIBS
D:\program\Qt\4.1\lib

Abdel.



Re: qt4 - config/qt.m4

2006-06-01 Thread Georg Baum
Jean-Marc Lasgouttes wrote:

>> "Abdelrazak" == Abdelrazak Younes
>> <[EMAIL PROTECTED]> writes:
> 
> Abdelrazak> I guess it would but do you mean to replace all Makefile.*
> Abdelrazak> with qmake files?
> 
> Something like that. Note that I am not saying it is a good idea. I am
> just thinking aloud (and I am not going to do it :)

I think it would be possible, but not easier than tweaking qt.m4. And I can
understand Lars' desire to use configure without flags, but I don't think
we need to do that for all possible configurations, only the mainstream
ones.


Georg



Re: qt4 - config/qt.m4

2006-06-01 Thread Peter Kümmel
Jean-Marc Lasgouttes wrote:
>> "Peter" == Peter Kümmel <[EMAIL PROTECTED]> writes:
> 
> Peter> I've not followed the thread but maybe this is what you are
> Peter> looking for:
> 
> Peter> qmake -query QT_INSTALL_LIBS 
> 
> This is not described by qmake help, it would be too easy! I finally
> found it in my qt3.3 manual, but I can only use 
> 
> * QT_INSTALL_PREFIX - Where the version of Qt this qmake is built
>   for resides 
> * QT_INSTALL_DATA - Where data for this version of Qt resides
> * QMAKE_VERSION - The current version of qmake
> 
> See for example:
> http://doc.trolltech.com/4.0/qmake-environment-reference.html
> 
> This is not very useful.
> 
> So it seems that your copy of qt has additional settings configured.
> Is that something we can rely on?
> 
> I really do not understand this stuff.
> 
> JMarc
> 
> 

I think it is quite stable, also kdelibs uses this variables to detect Qt4.
Maybe we should commit a bug report to Trolltech.


There are more variables, see qt4/qmake/property.cpp:

QString
QMakeProperty::value(QString v, bool just_check)
{
if(v == "QT_INSTALL_PREFIX")
return QLibraryInfo::location(QLibraryInfo::PrefixPath);
else if(v == "QT_INSTALL_DATA")
return QLibraryInfo::location(QLibraryInfo::DataPath);
else if(v == "QT_INSTALL_DOCS")
return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
else if(v == "QT_INSTALL_HEADERS")
return QLibraryInfo::location(QLibraryInfo::HeadersPath);
else if(v == "QT_INSTALL_LIBS")
return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
else if(v == "QT_INSTALL_BINS")
return QLibraryInfo::location(QLibraryInfo::BinariesPath);
else if(v == "QT_INSTALL_PLUGINS")
return QLibraryInfo::location(QLibraryInfo::PluginsPath);
else if(v == "QT_INSTALL_TRANSLATIONS")
return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
else if(v == "QT_INSTALL_CONFIGURATION")
return QLibraryInfo::location(QLibraryInfo::SettingsPath);
else if(v == "QT_INSTALL_EXAMPLES")
return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
else if(v == "QT_INSTALL_DEMOS")
return QLibraryInfo::location(QLibraryInfo::DemosPath);
else if(v == "QMAKE_MKSPECS")
return qmake_mkspec_paths().join(Option::target_mode == 
Option::TARG_WIN_MODE ? ";" : ":");
else if(v == "QMAKE_VERSION")
return qmake_version();
#ifdef QT_VERSION_STR
else if(v == "QT_VERSION")
return QT_VERSION_STR;
#endif





Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:

Abdelrazak> I guess it would but do you mean to replace all Makefile.*
Abdelrazak> with qmake files?

Something like that. Note that I am not saying it is a good idea. I am
just thinking aloud (and I am not going to do it :)

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Peter" == Peter Kümmel <[EMAIL PROTECTED]> writes:

Peter> I've not followed the thread but maybe this is what you are
Peter> looking for:

Peter> qmake -query QT_INSTALL_LIBS 

This is not described by qmake help, it would be too easy! I finally
found it in my qt3.3 manual, but I can only use 

* QT_INSTALL_PREFIX - Where the version of Qt this qmake is built
  for resides 
* QT_INSTALL_DATA - Where data for this version of Qt resides
* QMAKE_VERSION - The current version of qmake

See for example:
http://doc.trolltech.com/4.0/qmake-environment-reference.html

This is not very useful.

So it seems that your copy of qt has additional settings configured.
Is that something we can rely on?

I really do not understand this stuff.

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:



Abdelrazak> On locally compiled Qt4/MSVC2005 I have:

Another solution would be to compile the qtX/ frontends with qmake!
Would that magically work?
  

I guess it would but do you mean to replace all Makefile.* with qmake files?

Abdel.



Re: qt4 - config/qt.m4

2006-06-01 Thread Georg Baum
Jean-Marc Lasgouttes wrote:

> Forget it then. How does qmake support work then? Doesn't it need this
> stuff?

qmake has spec files for each platform that tell these things. The one I use
for qt 4 here resides in /usr/share/qt/mkspecs/linux-g++/qmake.conf (the
qt3 variant is in /usr/lib/qt3/mkspecs/linux-g++/qmake.conf)

pkg-config works well for the compile and link flags (and we should use it
IMO if it is available), but unfortunately it can not find the correct moc
and uic commands.


Georg



Re: qt4 - config/qt.m4

2006-06-01 Thread Peter Kümmel
Jean-Marc Lasgouttes wrote:
>> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
> 
> Lars> No. It is not.
> 
> Forget it then. How does qmake support work then? Doesn't it need this
> stuff? 
> 
> Hmm, I took a look at qmake documentation, and it seems there is no
> way to get the configuration from qmake itself. This is lame.
> 
> JMarc
> 
> 


I've not followed the thread but maybe this is what you are looking for:

qmake -query QT_INSTALL_LIBS
qmake -query QT_INSTALL_BINS
qmake -query QT_INSTALL_HEADERS
qmake -query QT_INSTALL_DOCS
qmake -query QMAKE_MKSPECS
qmake -query QT_VERSION

Peter


Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:

Abdelrazak> On locally compiled Qt4/MSVC2005 I have:

Another solution would be to compile the qtX/ frontends with qmake!
Would that magically work?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:

Lars> No. It is not.

Forget it then. How does qmake support work then? Doesn't it need this
stuff? 

Hmm, I took a look at qmake documentation, and it seems there is no
way to get the configuration from qmake itself. This is lame.

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Abdelrazak Younes

Jean-Marc Lasgouttes wrote:

"Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:


Lars> As another way of getting the info you mean?

Yes. And a way that could hopefully work on all platforms supported by
qt. How does the file look like on your system? Is it present?


On locally compiled Qt4/MSVC2005 I have:
D:\program\Qt\4.1\lib>dir *.prl
 Volume in drive D is DATA
 Volume Serial Number is 14EF-BEAC

 Directory of D:\program\Qt\4.1\lib

05/30/2006  06:21 PM   787 Qt3Support.prl
05/30/2006  06:21 PM   780 Qt3Supportd.prl
05/30/2006  06:28 PM   810 QtAssistantClient.prl
05/30/2006  06:28 PM   806 QtAssistantClientd.prl
05/30/2006  06:01 PM   777 QtCore.prl
05/30/2006  06:01 PM   770 QtCored.prl
05/30/2006  06:31 PM   689 QtDesigner.prl
05/30/2006  06:35 PM   721 QtDesignerComponents.prl
05/30/2006  06:35 PM   714 QtDesignerComponentsd.prl
05/30/2006  06:31 PM   682 QtDesignerd.prl
05/30/2006  06:05 PM   772 QtGui.prl
05/30/2006  06:05 PM   765 QtGuid.prl
05/30/2006  05:57 PM   816 qtmain.prl
05/30/2006  05:57 PM   809 qtmaind.prl
05/30/2006  06:20 PM   780 QtNetwork.prl
05/30/2006  06:20 PM   773 QtNetworkd.prl
05/30/2006  06:21 PM   784 QtOpenGL.prl
05/30/2006  06:21 PM   777 QtOpenGLd.prl
05/30/2006  06:19 PM   768 QtSql.prl
05/30/2006  06:19 PM   761 QtSqld.prl
05/30/2006  06:20 PM   768 QtSvg.prl
05/30/2006  06:20 PM   761 QtSvgd.prl
05/30/2006  06:30 PM   670 QtTest.prl
05/30/2006  06:30 PM   663 QtTestd.prl
05/30/2006  06:30 PM   801 QtUiTools.prl
05/30/2006  06:30 PM   797 QtUiToolsd.prl
05/30/2006  06:04 PM   768 QtXml.prl
05/30/2006  06:04 PM   761 QtXmld.prl

On official binary installation of Qt4/Mingw, I have:

D:\program\Qt\4.1.3\lib>dir *.prl
 Volume in drive D is DATA
 Volume Serial Number is 14EF-BEAC

 Directory of D:\program\Qt\4.1.3\lib

05/28/2006  04:40 PM   778 Qt3Support.prl
05/28/2006  04:40 PM   743 Qt3Supportd.prl
05/28/2006  04:40 PM   732 QtAssistantClient.prl
05/28/2006  04:40 PM   700 QtAssistantClientd.prl
05/28/2006  04:40 PM   768 QtCore.prl
05/28/2006  04:40 PM   733 QtCored.prl
05/28/2006  04:40 PM   680 QtDesigner.prl
05/28/2006  04:40 PM   712 QtDesignerComponents.prl
05/28/2006  04:40 PM   677 QtDesignerComponentsd.prl
05/28/2006  04:40 PM   645 QtDesignerd.prl
05/28/2006  04:40 PM   763 QtGui.prl
05/28/2006  04:40 PM   728 QtGuid.prl
05/28/2006  04:40 PM   810 qtmain.prl
05/28/2006  04:40 PM   775 qtmaind.prl
05/28/2006  04:40 PM   771 QtNetwork.prl
05/28/2006  04:40 PM   736 QtNetworkd.prl
05/28/2006  04:40 PM   775 QtOpenGL.prl
05/28/2006  04:40 PM   740 QtOpenGLd.prl
05/28/2006  04:40 PM   759 QtSql.prl
05/28/2006  04:40 PM   724 QtSqld.prl
05/28/2006  04:40 PM   759 QtSvg.prl
05/28/2006  04:40 PM   724 QtSvgd.prl
05/28/2006  04:40 PM   633 QtTest.prl
05/28/2006  04:40 PM   598 QtTestd.prl
05/28/2006  04:40 PM   723 QtUiTools.prl
05/28/2006  04:40 PM   691 QtUiToolsd.prl
05/28/2006  04:40 PM   759 QtXml.prl
05/28/2006  04:40 PM   724 QtXmld.prl



Re: qt4 - config/qt.m4

2006-06-01 Thread Lars Gullik Bjønnes
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

| > "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
| 
| Lars> As another way of getting the info you mean?
| 
| Yes. And a way that could hopefully work on all platforms supported by
| qt. How does the file look like on your system? Is it present?

No. It is not.

-- 
Lgb



Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:

Lars> As another way of getting the info you mean?

Yes. And a way that could hopefully work on all platforms supported by
qt. How does the file look like on your system? Is it present?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Lars Gullik Bjønnes
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

| > "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
| 
| Lars> pgk-config wouldn't be the only thing to use, only if it is
| Lars> present and if it handles the QtCore and QtGui packages.
| 
| Lars> else we fall back to dir search, env search and command line
| Lars> options.
| 
| And can we rely on having a useful qt.prl file from qmake?

As another way of getting the info you mean?

-- 
Lgb



Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:

Lars> pgk-config wouldn't be the only thing to use, only if it is
Lars> present and if it handles the QtCore and QtGui packages.

Lars> else we fall back to dir search, env search and command line
Lars> options.

And can we rely on having a useful qt.prl file from qmake?

JMarc


Re: qt4 - config/qt.m4

2006-06-01 Thread Lars Gullik Bjønnes
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

| > "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
| 
| Georg> I'd rather like the attached, since there does not seem to be
| Georg> an agreement between distros where to put qt4.
| 
| Are there distros that set QT4DIR? Should we really try to search by
| ourselves?

At least fc5 does not set qt4dir.
 
| Using pkg-config would be nice, but this will not work with OSX and
| windows, I guess. 

pgk-config wouldn't be the only thing to use, only if it is present
and if it handles the QtCore and QtGui packages.

else we fall back to dir search, env search and command line options.

-- 
Lgb



Re: qt4 - config/qt.m4

2006-06-01 Thread Jean-Marc Lasgouttes
> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:

Georg> I'd rather like the attached, since there does not seem to be
Georg> an agreement between distros where to put qt4.

Are there distros that set QT4DIR? Should we really try to search by
ourselves?

Using pkg-config would be nice, but this will not work with OSX and
windows, I guess. 

JMarc


Re: qt4 - config/qt.m4

2006-05-31 Thread Lars Gullik Bjønnes
Georg Baum <[EMAIL PROTECTED]> writes:

| 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.

That fails on fc5 x86_64. We should probably make it try to use
pkg-config if that is available.
 
pkg-config --cflags QtCore QtGui
-DQT_SHARED -I/usr/lib64/qt4/include -I/usr/lib64/qt4/include/QtCore
-I/usr/lib64/qt4/include/QtGui

etc.

-- 
Lgb



Re: qt4 - config/qt.m4

2006-05-31 Thread Georg Baum
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


Re: qt4 - config/qt.m4

2006-05-31 Thread Lars Gullik Bjønnes
"Kayvan A. Sylvan" <[EMAIL PROTECTED]> writes:

| On Wed, May 31, 2006 at 09:02:19PM +0200, Lars Gullik Bjønnes wrote:
| > 
| > To be able to build out-of-the-bos on fc5 with the qt4 from extras I
| > have to do something similar to:
| > 
| > 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?
| 
| Does this work for AMD64 as well?

Not sure yet, I'll check when I get home.

But I think it will.

-- 
Lgb



Re: qt4 - config/qt.m4

2006-05-31 Thread Kayvan A. Sylvan
On Wed, May 31, 2006 at 09:02:19PM +0200, Lars Gullik Bjønnes wrote:
> 
> To be able to build out-of-the-bos on fc5 with the qt4 from extras I
> have to do something similar to:
> 
> 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?

Does this work for AMD64 as well?

---Kayvan


qt4 - config/qt.m4

2006-05-31 Thread 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:

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?

-- 
Lgb