diff -up xmms-1.2.11-20071117cvs/configure.multidevel xmms-1.2.11-20071117cvs/configure --- xmms-1.2.11-20071117cvs/configure.multidevel 2016-11-18 10:19:19.416318744 -0500 +++ xmms-1.2.11-20071117cvs/configure 2016-11-18 10:21:42.901379471 -0500 @@ -33510,7 +33510,7 @@ subdirs="$subdirs libxmms" - ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mpg123/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" + ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mpg123/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -34178,6 +34178,7 @@ do "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;; "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;; "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;; + "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;; "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;; "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;; "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;; diff -up xmms-1.2.11-20071117cvs/xmms-config.in.multidevel xmms-1.2.11-20071117cvs/xmms-config.in --- xmms-1.2.11-20071117cvs/xmms-config.in.multidevel 2001-04-05 20:35:49.000000000 -0400 +++ xmms-1.2.11-20071117cvs/xmms-config.in 2016-11-18 10:19:19.433318634 -0500 @@ -18,24 +18,6 @@ exec_prefix_set=no data_dir="@datadir@/@PACKAGE@" version="@VERSION@" -include_dir="@includedir@" -xmms_include_dir="@includedir@/@PACKAGE@" -lib_dir="@libdir@" - -if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` - gtk_cflags=`gtk-config --cflags` -else - gtk_libs="@GTK_LIBS@" - gtk_cflags="@GTK_CFLAGS@" -fi - -plugin_dir="@plugindir@" -visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@" -input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@" -output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@" -effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@" -general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@" usage() { @@ -146,24 +128,12 @@ if test "$echo_exec_prefix" = "yes"; the echo $exec_prefix fi -if test "$include_dir" != "/usr/include"; then - cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags" -else - cflags="-I$xmms_include_dir $gtk_cflags" -fi - -if test "$lib_dir" != "/usr/lib"; then - libs="-L$lib_dir $gtk_libs -lxmms" -else - libs="$gtk_libs -lxmms" -fi - if test "$echo_cflags" = "yes"; then - echo $cflags + pkg-config xmms --cflags fi if test "$echo_libs" = "yes"; then - echo $libs + pkg-config xmms --libs fi if test "$echo_data_dir" = "yes"; then @@ -171,25 +141,25 @@ if test "$echo_data_dir" = "yes"; then fi if test "$echo_plugin_dir" = "yes"; then - echo $plugin_dir + pkg-config xmms --variable=plugin_dir fi if test "$echo_visualization_plugin_dir" = "yes"; then - echo $visualization_plugin_dir + pkg-config xmms --variable=visualization_plugin_dir fi if test "$echo_input_plugin_dir" = "yes"; then - echo $input_plugin_dir + pkg-config xmms --variable=input_plugin_dir fi if test "$echo_output_plugin_dir" = "yes"; then - echo $output_plugin_dir + pkg-config xmms --variable=output_plugin_dir fi if test "$echo_general_plugin_dir" = "yes"; then - echo $general_plugin_dir + pkg-config xmms --variable=general_plugin_dir fi if test "$echo_effect_plugin_dir" = "yes"; then - echo $effect_plugin_dir + pkg-config xmms --variable=effect_plugin_dir fi diff -up xmms-1.2.11-20071117cvs/xmms.pc.in.multidevel xmms-1.2.11-20071117cvs/xmms.pc.in --- xmms-1.2.11-20071117cvs/xmms.pc.in.multidevel 2016-11-18 10:19:19.434318627 -0500 +++ xmms-1.2.11-20071117cvs/xmms.pc.in 2016-11-18 10:19:19.434318627 -0500 @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +data_dir=@datadir@ +plugin_dir=@plugindir@ +visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@ +input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@ +output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@ +effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@ +general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@ + +Name: XMMS +Description: The X MultiMedia System, a media player +Version: @VERSION@ +Requires: gtk+ +Libs: -L${libdir} -lxmms +Cflags: -I${includedir} -I${includedir}/@PACKAGE@