Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
network:telephony
h323plus
h323plus-fix-ptlib-config-check.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File h323plus-fix-ptlib-config-check.patch of Package h323plus
Index: h323plus/configure.ac =================================================================== --- h323plus.orig/configure.ac 2018-01-17 15:22:50.326951081 +0100 +++ h323plus/configure.ac 2018-01-17 15:22:51.326967174 +0100 @@ -112,8 +112,9 @@ fi 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 +126,7 @@ if test "${HAS_PTLIB_LIB_MAK:-unset}" = 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 +135,7 @@ if test "${HAS_PTLIB_LIB_MAK:-unset}" = fi fi +echo "JW9" echo "PTLib prefix set to.... $PTLIBDIR" if test "${PTLIB_CONFIG:-unset}" != "unset" ; then Index: h323plus/configure =================================================================== --- h323plus.orig/configure 2016-11-10 09:58:00.000000000 +0100 +++ h323plus/configure 2018-01-17 15:32:46.600531615 +0100 @@ -668,11 +668,6 @@ PTLIB_CXXFLAGS target_cpu target_os PT_LIBDIR -PTLIB_LIBS -PTLIB_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG PTLIB_CONFIG OPENH323_VERSION BUILD_NUMBER @@ -785,12 +780,7 @@ CPPFLAGS 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. @@ -1458,14 +1448,6 @@ Some influential environment variables: 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. @@ -3800,7 +3782,7 @@ fi 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 @@ -3814,7 +3796,7 @@ else ;; *) 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=. @@ -3883,6 +3865,49 @@ $as_echo "no" >&6; } 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 @@ -3930,217 +3955,9 @@ fi 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` - test "x$?" != "x0" && pkg_failed=yes -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` - test "x$?" != "x0" && pkg_failed=yes -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 --cflags --libs "ptlib" 2>&1` - else - PTLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "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` @@ -4151,6 +3968,7 @@ fi 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" @@ -4159,6 +3977,7 @@ fi fi fi +echo "JW9" echo "PTLib prefix set to.... $PTLIBDIR" if test "${PTLIB_CONFIG:-unset}" != "unset" ; then @@ -4784,6 +4603,8 @@ fi + + # Check whether --enable-h46025 was given. if test "${enable_h46025+set}" = set; then :
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
