libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windows requires -lwinhttp

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-27 12:35:01 +00:00
parent 70b2da34cd
commit ff210745f0
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@@ -1,3 +1,19 @@
2015-07-23 12:42 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
configure.ac, mac-create-app-bundle.sh,
src/proxyface/autoproxy.hxx: compiles for mingw now
2015-07-14 09:37 marc
* debian/control.in: extended dependencies
2015-05-09 09:06 marc
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
bootstrap.sh, src/proxyface.pc.in, src/version.hxx: fixed
dependencies in pkg-config
2015-03-15 15:57 marc 2015-03-15 15:57 marc
* ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4, * ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4,

12
ax_check_qt.m4
View File

@@ -42,10 +42,10 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
HAVE_$1=1 HAVE_$1=1
AC_MSG_CHECKING([for $2]) AC_MSG_CHECKING([for $2])
AC_ARG_VAR([$1], [path to Qt tool $2]) AC_ARG_VAR([$1], [path to Qt tool $2])
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=$2_location Qt5Core)} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins Qt5Core)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=$2_location QtCore)} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins QtCore)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
if ! which "${$1%% *}" > /dev/null; then if ! which "${$1%% *}" > /dev/null; then
if which "$2" > /dev/null; then if which "$2" > /dev/null; then
$1=$2 $1=$2
@@ -100,7 +100,7 @@ AC_DEFUN([AX_CHECK_QT], [
PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [ PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [
HAVE_$1=1 HAVE_$1=1
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix Qt5Core) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
CPPFLAGS+=" ${[$1]5_CFLAGS}" CPPFLAGS+=" ${[$1]5_CFLAGS}"
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
@@ -122,7 +122,7 @@ AC_DEFUN([AX_CHECK_QT], [
PKG_CHECK_MODULES([$1], [${qt_modules}], [ PKG_CHECK_MODULES([$1], [${qt_modules}], [
HAVE_$1=1 HAVE_$1=1
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix QtCore) QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
CPPFLAGS+=" ${$1_CFLAGS}" CPPFLAGS+=" ${$1_CFLAGS}"
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"

10
ax_init_standard_project.m4
View File

@@ -415,8 +415,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(CXXFLAGS) AC_SUBST(CXXFLAGS)
AC_SUBST(PKG_REQUIREMENTS) AC_SUBST(PKG_REQUIREMENTS)
if test -n "$3" -a "${$1_found}" != "no"; then if test -n "$3"; then
tmp_package=${$1_found} if test "${$1_found}" = "no"; then
tmp_package="yes"
else
tmp_package=${$1_found}
fi
$1_found=no $1_found=no
old_CPPFLAGS=${CPPFLAGS} old_CPPFLAGS=${CPPFLAGS}
CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}"
@@ -438,7 +442,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
fi fi
done done
if test "${$1_found}" = "no"; then if test "${$1_found}" = "no"; then
tmp_includedir=$(${ac_tool_prefix}pkg-config --variable=includedir $tmp_package) tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package)
for x in ${tmp_includedir}; do for x in ${tmp_includedir}; do
AC_MSG_NOTICE([search for $3 in $x]) AC_MSG_NOTICE([search for $3 in $x])
for f in $(find ${x} -name "$3"); do for f in $(find ${x} -name "$3"); do

8
configure.ac
View File

@@ -24,7 +24,13 @@ AX_USE_RPM_PACKAGING
AX_BUILD_EXAMPLES AX_BUILD_EXAMPLES
AX_CHECK_QT([QT], [QtNetwork QtGui], [QtWidgets]) AX_CHECK_QT([QT], [QtNetwork QtGui], [QtWidgets])
AX_PKG_CHECK([PROXY], [libproxy-1.0]) if test "${MINGW}" = "no"; then
AX_PKG_CHECK([PROXY], [libproxy-1.0])
else
LDFLAGS+=" -lwinhttp"
HAVE_PROXY=0
fi
AM_CONDITIONAL(HAVE_PROXY, test ${HAVE_PROXY} -eq 1)
if test "$HAVE_QT" -ne 1 -a "$HAVE_PROXY" -ne 1; then if test "$HAVE_QT" -ne 1 -a "$HAVE_PROXY" -ne 1; then
AC_MSG_ERROR([Either Qt or Google Proxy is required.]) AC_MSG_ERROR([Either Qt or Google Proxy is required.])