Skip to content

Commit

Permalink
fix a defect of Qt detection. Version 15.2.1.
Browse files Browse the repository at this point in the history
2017-04-19  Hidehisa Akiyama  <akky@users.sourceforge.jp>

	* NEWS:
	* configure.ac:
	- updated a point version number. Official release 15.2.1.

	* m4/qt.m4:
	- fix a defect of Qt detection on Ubuntu 16.04.
  • Loading branch information
Hidehisa Akiyama committed Apr 19, 2017
1 parent 3df5900 commit 4906be2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2017-04-19 Hidehisa Akiyama <akky@users.sourceforge.jp>

* NEWS:
* configure.ac:
- updated a point version number. Official release 15.2.1.

* m4/qt.m4:
- fix a defect of Qt detection on Ubuntu 16.04.

2016-09-19 Hidehisa Akiyama <akky@users.sourceforge.jp>

* NEWS:
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[15.2.1]
* Fix a defect of Qt detection on Ubuntu 16.04.

[15.2.0]
* Update m4 macro files for boost.

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.61)
AC_INIT([rcsslogplayer],[15.2.0],[sserver-admin@users.sf.net],[rcsslogplayer])
AC_INIT([rcsslogplayer],[15.2.1],[sserver-admin@users.sf.net],[rcsslogplayer])

#LT_PREREQ(2.2.4)

Expand Down
4 changes: 2 additions & 2 deletions m4/qt.m4
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ AC_DEFUN([AX_QT3],
QT3_CXXFLAGS="$QT3_CFLAGS"
QT3_CPPFLAGS=""
QT3_LDFLAGS=$($PKG_CONFIG --libs-only-L qt-mt)
QT3_LDADD="$($PKG_CONFIG --libs-only-other qt-mt)$($PKG_CONFIG --libs-only-l qt-mt)"
QT3_LDADD="$($PKG_CONFIG --libs-only-other qt-mt) $($PKG_CONFIG --libs-only-l qt-mt)"
AC_MSG_NOTICE([set QT3_CXXFLAGS... $QT3_CXXFLAGS])
AC_MSG_NOTICE([set QT3_LDFLAGS... $QT3_LDFLAGS])
AC_MSG_NOTICE([set QT3_LDADD... $QT3_LDADD])
Expand Down Expand Up @@ -140,7 +140,7 @@ AC_DEFUN([AX_QT4],
QT4_CXXFLAGS="$QT4_CFLAGS"
QT4_CPPFLAGS=""
QT4_LDFLAGS=$($PKG_CONFIG --static --libs-only-L $QT4_REQUIRED_MODULES)
QT4_LDADD="$($PKG_CONFIG --static --libs-only-other $QT4_REQUIRED_MODULES)$($PKG_CONFIG --static --libs-only-l $QT4_REQUIRED_MODULES)"
QT4_LDADD="$($PKG_CONFIG --static --libs-only-other $QT4_REQUIRED_MODULES) $($PKG_CONFIG --static --libs-only-l $QT4_REQUIRED_MODULES)"
AC_MSG_NOTICE([set QT4_CXXFLAGS... $QT4_CXXFLAGS])
AC_MSG_NOTICE([set QT4_LDFLAGS... $QT4_LDFLAGS])
AC_MSG_NOTICE([set QT4_LDADD... $QT4_LDADD])
Expand Down

0 comments on commit 4906be2

Please sign in to comment.