|
Paul F. Johnson |
c6fa5f2 |
--- xmms-1.2.11-20071117cvs/configure 2008-09-02 21:03:56.000000000 +0100
|
|
Paul F. Johnson |
c6fa5f2 |
+++ xmms-1.2.11-20071117cvs/configure-new 2008-09-02 21:36:04.000000000 +0100
|
|
Paul F. Johnson |
c6fa5f2 |
@@ -33510,7 +33510,7 @@
|
|
Paul F. Johnson |
c6fa5f2 |
|
|
Paul F. Johnson |
c6fa5f2 |
|
|
Paul F. Johnson |
c6fa5f2 |
|
|
Paul F. Johnson |
c6fa5f2 |
- 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/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"
|
|
Paul F. Johnson |
c6fa5f2 |
+ 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/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"
|
|
Paul F. Johnson |
c6fa5f2 |
ac_config_commands="$ac_config_commands default"
|
|
Paul F. Johnson |
c6fa5f2 |
cat >confcache <<\_ACEOF
|
|
Paul F. Johnson |
c6fa5f2 |
# This file is a shell script that caches the results of configure
|
|
Paul F. Johnson |
c6fa5f2 |
@@ -34178,6 +34178,7 @@
|
|
Paul F. Johnson |
c6fa5f2 |
"wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
"xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
"xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
+ "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
"xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
"xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
"Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;;
|
|
Paul F. Johnson |
c6fa5f2 |
--- xmms-1.2.11-20071117cvs/xmms-config.in 2001-04-06 01:35:49.000000000 +0100
|
|
Paul F. Johnson |
c6fa5f2 |
+++ xmms-1.2.11-20071117cvs/xmms-config-new.in 2008-09-02 22:23:29.000000000 +0100
|
|
 |
3434ff3 |
@@ -18,24 +18,6 @@
|
|
|
3434ff3 |
data_dir="@datadir@/@PACKAGE@"
|
|
|
3434ff3 |
|
|
|
3434ff3 |
version="@VERSION@"
|
|
|
3434ff3 |
-include_dir="@includedir@"
|
|
|
3434ff3 |
-xmms_include_dir="@includedir@/@PACKAGE@"
|
|
|
3434ff3 |
-lib_dir="@libdir@"
|
|
|
3434ff3 |
-
|
|
|
3434ff3 |
-if ( (gtk-config --version) > /dev/null 2>&1) then
|
|
|
3434ff3 |
- gtk_libs=`gtk-config --libs`
|
|
|
3434ff3 |
- gtk_cflags=`gtk-config --cflags`
|
|
|
3434ff3 |
-else
|
|
|
3434ff3 |
- gtk_libs="@GTK_LIBS@"
|
|
|
3434ff3 |
- gtk_cflags="@GTK_CFLAGS@"
|
|
|
3434ff3 |
-fi
|
|
|
3434ff3 |
-
|
|
|
3434ff3 |
-plugin_dir="@plugindir@"
|
|
|
3434ff3 |
-visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@"
|
|
|
3434ff3 |
-input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@"
|
|
|
3434ff3 |
-output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@"
|
|
|
3434ff3 |
-effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@"
|
|
|
3434ff3 |
-general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@"
|
|
|
3434ff3 |
|
|
|
3434ff3 |
usage()
|
|
|
3434ff3 |
{
|
|
|
3434ff3 |
@@ -146,24 +128,12 @@
|
|
|
3434ff3 |
echo $exec_prefix
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
-if test "$include_dir" != "/usr/include"; then
|
|
|
3434ff3 |
- cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags"
|
|
|
3434ff3 |
-else
|
|
|
3434ff3 |
- cflags="-I$xmms_include_dir $gtk_cflags"
|
|
|
3434ff3 |
-fi
|
|
|
3434ff3 |
-
|
|
|
3434ff3 |
-if test "$lib_dir" != "/usr/lib"; then
|
|
|
3434ff3 |
- libs="-L$lib_dir $gtk_libs -lxmms"
|
|
|
3434ff3 |
-else
|
|
|
3434ff3 |
- libs="$gtk_libs -lxmms"
|
|
|
3434ff3 |
-fi
|
|
|
3434ff3 |
-
|
|
|
3434ff3 |
if test "$echo_cflags" = "yes"; then
|
|
|
3434ff3 |
- echo $cflags
|
|
|
3434ff3 |
+ pkg-config xmms --cflags
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_libs" = "yes"; then
|
|
|
3434ff3 |
- echo $libs
|
|
|
3434ff3 |
+ pkg-config xmms --libs
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_data_dir" = "yes"; then
|
|
|
3434ff3 |
@@ -171,25 +141,25 @@
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $plugin_dir
|
|
|
3434ff3 |
+ pkg-config xmms --variable=plugin_dir
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_visualization_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $visualization_plugin_dir
|
|
Paul F. Johnson |
eddc16a |
+ pkg-config xmms --variable=visualization_plugin_dir
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_input_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $input_plugin_dir
|
|
|
3434ff3 |
+ pkg-config xmms --variable=input_plugin_dir
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_output_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $output_plugin_dir
|
|
|
3434ff3 |
+ pkg-config xmms --variable=output_plugin_dir
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_general_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $general_plugin_dir
|
|
|
3434ff3 |
+ pkg-config xmms --variable=general_plugin_dir
|
|
|
3434ff3 |
fi
|
|
|
3434ff3 |
|
|
|
3434ff3 |
if test "$echo_effect_plugin_dir" = "yes"; then
|
|
|
3434ff3 |
- echo $effect_plugin_dir
|
|
|
3434ff3 |
+ pkg-config xmms --variable=effect_plugin_dir
|
|
|
3434ff3 |
fi
|
|
Paul F. Johnson |
c6fa5f2 |
|
|
|
3434ff3 |
--- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300
|
|
|
3434ff3 |
+++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300
|
|
|
3434ff3 |
@@ -0,0 +1,18 @@
|
|
|
3434ff3 |
+prefix=@prefix@
|
|
|
3434ff3 |
+exec_prefix=@exec_prefix@
|
|
|
3434ff3 |
+libdir=@libdir@
|
|
|
3434ff3 |
+includedir=@includedir@
|
|
|
3434ff3 |
+data_dir=@datadir@
|
|
|
3434ff3 |
+plugin_dir=@plugindir@
|
|
|
3434ff3 |
+visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@
|
|
|
3434ff3 |
+input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@
|
|
|
3434ff3 |
+output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@
|
|
|
3434ff3 |
+effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@
|
|
|
3434ff3 |
+general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@
|
|
|
3434ff3 |
+
|
|
|
3434ff3 |
+Name: XMMS
|
|
|
3434ff3 |
+Description: The X MultiMedia System, a media player
|
|
|
3434ff3 |
+Version: @VERSION@
|
|
|
3434ff3 |
+Requires: gtk+
|
|
|
3434ff3 |
+Libs: -L${libdir} -lxmms
|
|
|
3434ff3 |
+Cflags: -I${includedir} -I${includedir}/@PACKAGE@
|
|
Paul F. Johnson |
c6fa5f2 |
|