Open Source Projects Europe

diff -u -r upmpdcli-1.2.2/configure upmpdcli-1.2.2-fedora/configure

--- upmpdcli-1.2.2/configure  2016-09-10 19:43:19.000000000 +0200

 upmpdcli-1.2.2-fedora/configure   2016-09-11 14:02:15.333898706 +0200

@@ -628,6 +628,7 @@

 LIBOBJS

 SCCTL_LIBS

 UPMPDCLI_LIBS

CXXCPP

 EGREP

 GREP

 CPP

@@ -736,7 +737,8 @@

 CCC

 CC

 CFLAGS

-CPP'

CPP

CXXCPP'

 # Initialize some variables set by options.

@@ -1369,6 +1371,7 @@

   CC          C compiler command

   CFLAGS      C compiler flags

   CPP         C preprocessor

  CXXCPP      C++ preprocessor

 Use these variables to override the choices made by `configure' or to help

 it to find libraries and programs with nonstandard names/locations.

@@ -1737,6 +1740,134 @@

 } # ac_fn_c_try_link

# ac_fn_cxx_try_cpp LINENO

# ------------------------

# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

ac_fn_cxx_try_cpp ()

{

  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

  if { { ac_try="$ac_cpp conftest.$ac_ext"

case "(($ac_try" in

  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

  *) ac_try_echo=$ac_try;;

esac

eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

$as_echo "$ac_try_echo"; } >&5

  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

  ac_status=$?

  if test -s conftest.err; then

    grep -v '^ *+' conftest.err >conftest.er1

    cat conftest.er1 >&5

    mv -f conftest.er1 conftest.err

  fi

  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

  test $ac_status = 0; } > conftest.i && {

  test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

  test ! -s conftest.err

       }; then :

  ac_retval=0

else

  $as_echo "$as_me: failed program was:" >&5

sed 's/^/| /' conftest.$ac_ext >&5

    ac_retval=1

fi

  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

  as_fn_set_status $ac_retval

} # ac_fn_cxx_try_cpp

# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES

# ---------------------------------------------------------

# Tests whether HEADER exists, giving a warning if it cannot be compiled using

# the include files in INCLUDES and setting the cache variable VAR

# accordingly.

ac_fn_cxx_check_header_mongrel ()

{

  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

  if eval \${$3+:} false; then :

  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

$as_echo_n "checking for $2... " >&6; }

if eval \${$3+:} false; then :

  $as_echo_n "(cached) " >&6

fi

eval ac_res=\$$3

        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

$as_echo "$ac_res" >&6; }

else

  # Is the header compilable?

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

$as_echo_n "checking $2 usability... " >&6; }

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

$4

#include <$2>

_ACEOF

if ac_fn_cxx_try_compile "$LINENO"; then :

  ac_header_compiler=yes

else

  ac_header_compiler=no

fi

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

$as_echo "$ac_header_compiler" >&6; }

# Is the header present?

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

$as_echo_n "checking $2 presence... " >&6; }

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

#include <$2>

_ACEOF

if ac_fn_cxx_try_cpp "$LINENO"; then :

  ac_header_preproc=yes

else

  ac_header_preproc=no

fi

rm -f conftest.err conftest.i conftest.$ac_ext

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

$as_echo "$ac_header_preproc" >&6; }

# So?  What about this header?

case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((

  yes:no: )

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

    ;;

  no:yes:* )

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5

$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5

$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}

    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

( $as_echo "## ------------------------------------- ##

## Report this to jfd@lesbonscomptes.com ##

## ------------------------------------- ##"

     ) | sed "s/^/$as_me: WARNING:     /" >&2

    ;;

esac

  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

$as_echo_n "checking for $2... " >&6; }

if eval \${$3+:} false; then :

  $as_echo_n "(cached) " >&6

else

  eval "$3=\$ac_header_compiler"

fi

eval ac_res=\$$3

        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

$as_echo "$ac_res" >&6; }

fi

  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

} # ac_fn_cxx_check_header_mongrel

 # ac_fn_cxx_try_link LINENO

 # -------------------------

 # Try to link conftest.$ac_ext, and return whether this succeeded.

@@ -4798,11 +4929,163 @@

 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

-LIBS="$LIBS -ljsoncpp"

ac_ext=cpp

ac_cpp='$CXXCPP $CPPFLAGS'

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

if test -z "$CXXCPP"; then

  if ${ac_cv_prog_CXXCPP+:} false; then :

  $as_echo_n "(cached) " >&6

else

      # Double quotes because CXXCPP needs to be expanded

    for CXXCPP in "$CXX -E" "/lib/cpp"

    do

      ac_preproc_ok=false

for ac_cxx_preproc_warn_flag in '' yes

do

  # Use a header file that comes with gcc, so configuring glibc

  # with a fresh cross-compiler works.

  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

  # <limits.h> exists even on freestanding compilers.

  # On the NeXT, cc -E runs the code through the compiler's parser,

  # not just through cpp. "Syntax error" is here to catch this case.

  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

#ifdef __STDC__

# include <limits.h>

#else

# include <assert.h>

#endif

          Syntax error

_ACEOF

if ac_fn_cxx_try_cpp "$LINENO"; then :

else

  # Broken: fails on valid input.

continue

fi

rm -f conftest.err conftest.i conftest.$ac_ext

  # OK, works on sane cases.  Now check whether nonexistent headers

  # can be detected and how.

  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

#include <ac_nonexistent.h>

_ACEOF

if ac_fn_cxx_try_cpp "$LINENO"; then :

  # Broken: success on invalid input.

continue

else

  # Passes both tests.

ac_preproc_ok=:

break

fi

rm -f conftest.err conftest.i conftest.$ac_ext

done

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

rm -f conftest.i conftest.err conftest.$ac_ext

if $ac_preproc_ok; then :

  break

fi

    done

    ac_cv_prog_CXXCPP=$CXXCPP

fi

  CXXCPP=$ac_cv_prog_CXXCPP

else

  ac_cv_prog_CXXCPP=$CXXCPP

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

$as_echo "$CXXCPP" >&6; }

ac_preproc_ok=false

for ac_cxx_preproc_warn_flag in '' yes

do

  # Use a header file that comes with gcc, so configuring glibc

  # with a fresh cross-compiler works.

  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

  # <limits.h> exists even on freestanding compilers.

  # On the NeXT, cc -E runs the code through the compiler's parser,

  # not just through cpp. "Syntax error" is here to catch this case.

  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

#ifdef __STDC__

# include <limits.h>

#else

# include <assert.h>

#endif

          Syntax error

_ACEOF

if ac_fn_cxx_try_cpp "$LINENO"; then :

else

  # Broken: fails on valid input.

continue

fi

rm -f conftest.err conftest.i conftest.$ac_ext

  # OK, works on sane cases.  Now check whether nonexistent headers

  # can be detected and how.

  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h.  */

#include <ac_nonexistent.h>

_ACEOF

if ac_fn_cxx_try_cpp "$LINENO"; then :

  # Broken: success on invalid input.

continue

else

  # Passes both tests.

ac_preproc_ok=:

break

fi

rm -f conftest.err conftest.i conftest.$ac_ext

done

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

rm -f conftest.i conftest.err conftest.$ac_ext

if $ac_preproc_ok; then :

else

  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check

See \`config.log' for more details" "$LINENO" 5; }

fi

ac_ext=cpp

ac_cpp='$CXXCPP $CPPFLAGS'

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

for ac_header in json/json.h jsoncpp/json/json.h

do :

  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

  cat >>confdefs.h <<_ACEOF

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

_ACEOF

fi

done

LIBS="$LIBS -ljsoncpp"

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

-#include <jsoncpp/json/json.h>

#ifdef HAVE_JSONCPP_JSON_JSON_H

    #include <jsoncpp/json/json.h>

    #else

    #include <json/json.h>

    #endif

 int

 main ()

 {

diff -u -r upmpdcli-1.2.2/src/config.h.in upmpdcli-1.2.2-fedora/src/config.h.in

--- upmpdcli-1.2.2/src/config.h.in    2016-09-10 19:43:58.000000000 +0200

 upmpdcli-1.2.2-fedora/src/config.h.in 2016-09-11 12:45:53.000000000 +0200

@@ -3,6 +3,12 @@

 /* Define to 1 if you have the <inttypes.h> header file. */

 #undef HAVE_INTTYPES_H

/* Define to 1 if you have the <jsoncpp/json/json.h> header file. */

#undef HAVE_JSONCPP_JSON_JSON_H

/* Define to 1 if you have the <json/json.h> header file. */

#undef HAVE_JSON_JSON_H

 /* Define to 1 if you have the `microhttpd' library (-lmicrohttpd). */

 #undef HAVE_LIBMICROHTTPD

diff -u -r upmpdcli-1.2.2/src/mediaserver/cdplugins/plgwithslave.cxx upmpdcli-1.2.2-fedora/src/mediaserver/cdplugins/plgwithslave.cxx

--- upmpdcli-1.2.2/src/mediaserver/cdplugins/plgwithslave.cxx 2016-09-10 18:03:33.000000000 +0200

 upmpdcli-1.2.2-fedora/src/mediaserver/cdplugins/plgwithslave.cxx  2016-09-11 12:47:04.000000000 +0200

@@ -14,6 +14,7 @@

  *   Free Software Foundation, Inc.,

  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

  */

#include "config.h"

 #include "plgwithslave.hxx"

@@ -25,7 +26,11 @@

 #include <string.h>

 #include <upnp/upnp.h>

 #include <microhttpd.h>

#ifdef HAVE_JSONCPP_JSON_JSON_H

 #include <jsoncpp/json/json.h>

#else

#include <json/json.h>

#endif

 #include "cmdtalk.h"

 #include "pathut.h"