File h323plus-fix-ptlib-config-check.patch of Package h323plus
--- a/configure.ac 2014-03-26 00:58:15.000000000 +0100
+++ b/configure.ac 2015-04-16 01:07:45.519895747 +0200
@@ -79,13 +79,17 @@
PTLIBDIR="${HOME}/ptlib"
else
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin)
else
- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
else
if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+ else
+ if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/)
+ fi
fi
fi
fi
@@ -112,8 +116,9 @@
AC_CHECK_FILE(${PTLIBDIR}/make/lib.mak, HAS_PTLIB_LIB_MAK=1)
if test "${HAS_PTLIB_LIB_MAK:-unset}" = "unset" ; then
+ echo "JW5"
PKG_PROG_PKG_CONFIG
- PKG_CHECK_MODULES([PTLIB], [ptlib], HAS_PTLIB=1)
+ dnl PKG_CHECK_MODULES([PTLIB], [ptlib], HAS_PTLIB=1)
if test ${HAS_PTLIB}x = 1x; then
PTLIBDIR=`${PKG_CONFIG} --variable=prefix ptlib`
PTVERSION=`${PKG_CONFIG} --modversion ptlib`
@@ -125,6 +130,7 @@
PT_MAJOR_VERSION=`echo $PTVERSION | cut -d'.' -f1`
PT_MINOR_VERSION=`echo $PTVERSION | cut -d'.' -f2`
PT_BUILD_NUMBER=`echo $PTVERSION | cut -d'.' -f3`
+echo "JW8"
AC_SUBST(PT_LIBDIR)
AC_SUBST(target_os)
AC_SUBST(target_cpu)
@@ -133,6 +139,7 @@
fi
fi
+echo "JW9"
echo "PTLib prefix set to.... $PTLIBDIR"
if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
--- a/configure 2014-05-09 18:51:49.000000000 +0200
+++ b/configure 2015-04-16 01:07:34.610358472 +0200
@@ -633,6 +633,7 @@
H323_AEC
H323_FILE
H323_GNUGK
+H323_T140
H323_T120
H323_T38
H323_H501
@@ -641,7 +642,6 @@
H323_H460PRE
H323_H460P
H323_H46026
-H323_H46025
H323_H46023
H323_H46019M
H323_H46018
@@ -667,11 +667,6 @@
target_cpu
target_os
PT_LIBDIR
-PTLIB_LIBS
-PTLIB_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
PTLIB_CONFIG
OPENH323_VERSION
BUILD_NUMBER
@@ -782,12 +777,7 @@
CCC
CC
CFLAGS
-CPP
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-PTLIB_CFLAGS
-PTLIB_LIBS'
+CPP'
ac_subdirs_all='plugins'
# Initialize some variables set by options.
@@ -1417,16 +1407,16 @@
--disable-h46018 disable H.460.18/.19
--disable-h46019m disable H.460.19 RTP multiplexing
--disable-h46023 disable H.460.23/.24
- --enable-h46025 enable H.460.25
- --enable-h46026 enable H.460.26
+ --disable-h46025 disable H.460.25
+ --disable-h46026 disable H.460.26
--enable-h460p enable H.460 Presence
--enable-h460pre enable H.460 PreEmption
--enable-h460com enable H.460 Compat Feature
--enable-h461 enable H.461 ASSET Feature
--disable-h501 disable H.501
--disable-t38 disable T.38
- --enable-t120 enable T.120
- --enable-t140 enable T.140
+ --disable-t120 disable T.120
+ --disable-t140 disable T.140
--disable-gnugk disable GnuGk NAT
--disable-file disable File Transfer
--enable-aec enable Acoustic Echo Cancellation
@@ -1443,14 +1433,6 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
- PKG_CONFIG path to pkg-config utility
- PKG_CONFIG_PATH
- directories to add to pkg-config's search path
- PKG_CONFIG_LIBDIR
- path overriding pkg-config's built-in search path
- PTLIB_CFLAGS
- C compiler flags for PTLIB, overriding pkg-config
- PTLIB_LIBS linker flags for PTLIB, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -3756,7 +3738,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/local/bin
+for as_dir in /usr/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3784,7 +3766,7 @@
else
- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
# Extract the first word of "ptlib-config", so it can be a program name with args.
set dummy ptlib-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -3798,7 +3780,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/share/ptlib/make/
+for as_dir in /usr/local/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3867,6 +3849,49 @@
fi
+ else
+ if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+ # Extract the first word of "ptlib-config", so it can be a program name with args.
+set dummy ptlib-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PTLIB_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PTLIB_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/share/ptlib/
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG
+if test -n "$PTLIB_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5
+$as_echo "$PTLIB_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
fi
fi
fi
@@ -3913,215 +3938,9 @@
if test "${HAS_PTLIB_LIB_MAK:-unset}" = "unset" ; then
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTLIB" >&5
-$as_echo_n "checking for PTLIB... " >&6; }
-
-if test -n "$PTLIB_CFLAGS"; then
- pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ptlib\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ptlib") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PTLIB_CFLAGS=`$PKG_CONFIG --cflags "ptlib" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$PTLIB_LIBS"; then
- pkg_cv_PTLIB_LIBS="$PTLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ptlib\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ptlib") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PTLIB_LIBS=`$PKG_CONFIG --libs "ptlib" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- PTLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ptlib" 2>&1`
- else
- PTLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "ptlib" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$PTLIB_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (ptlib) were not met:
-
-$PTLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PTLIB_CFLAGS
-and PTLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PTLIB_CFLAGS
-and PTLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- PTLIB_CFLAGS=$pkg_cv_PTLIB_CFLAGS
- PTLIB_LIBS=$pkg_cv_PTLIB_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAS_PTLIB=1
-fi
- if test ${HAS_PTLIB}x = 1x; then
+ echo "JW5"
+ PKG_PROG_PKG_CONFIG
+ if test ${HAS_PTLIB}x = 1x; then
PTLIBDIR=`${PKG_CONFIG} --variable=prefix ptlib`
PTVERSION=`${PKG_CONFIG} --modversion ptlib`
target_os=`${PKG_CONFIG} --variable=target_os ptlib`
@@ -4132,6 +3951,7 @@
PT_MAJOR_VERSION=`echo $PTVERSION | cut -d'.' -f1`
PT_MINOR_VERSION=`echo $PTVERSION | cut -d'.' -f2`
PT_BUILD_NUMBER=`echo $PTVERSION | cut -d'.' -f3`
+echo "JW8"
@@ -4140,6 +3960,7 @@
fi
fi
+echo "JW9"
echo "PTLib prefix set to.... $PTLIBDIR"
if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
@@ -4764,6 +4585,8 @@
fi
+
+
# Check whether --enable-h46025 was given.
if test "${enable_h46025+set}" = set; then :
enableval=$enable_h46025;
@@ -4773,12 +4596,12 @@
enable_h46023=$default_h46025
fi
if test "$enable_h46025" = "yes" ; then
- H323_h46025=1
+ H323_H46025=1
-$as_echo "#define H323_h46025 1" >>confdefs.h
+$as_echo "#define H323_H46025 1" >>confdefs.h
else
- H323_h46025=
+ H323_H46025=
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling H.460.25" >&5
$as_echo "$as_me: Disabling H.460.25" >&6;}
fi
@@ -4954,7 +4777,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling T.120" >&5
$as_echo "$as_me: Disabling T.120" >&6;}
else
- H323_T120=1
+ H323_T20=1
$as_echo "#define H323_T120 1" >>confdefs.h
