* *: Make installation parallelizable.
* configure.ac: Don't change default prefix to /usr.
* libvisual-0.3.pc.in: Rename from libvisual.pc.in.

Author: descender

libvisual/Makefile.am

@@ -3,11 +3,11 @@
 SUBDIRS = m4  libvisual po
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvisual.pc
+pkgconfig_DATA = libvisual-0.3.pc
 
 install-exec-local: libvisual/lvconfig.h 
 	        $(mkinstalldirs) $(DESTDIR)$(includedir)/libvisual
-	        file=$(DESTDIR)$(includedir)/libvisual/lvconfig.h; \
+	        file=$(DESTDIR)$(includedir)/libvisual-0.3/libvisual/lvconfig.h; \
 	        if test -r $$file && cmp -s libvisual/lvconfig.h $$file; then :; \
 	        else $(INSTALL_DATA) libvisual/lvconfig.h $$file; fi
 

libvisual/config.h.in

@@ -7,6 +7,14 @@
 /* GETTEXT package name */
 #undef GETTEXT_PACKAGE
 
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT

libvisual/configure.ac

@@ -1,13 +1,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(Libvisual Library, 0.3.0, [email protected], libvisual)
+AC_INIT([Libvisual Library], [0.3.0], [[email protected]], [libvisual])
 AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])
 
 AC_CONFIG_HEADER(config.h)
 
-AC_PREFIX_DEFAULT(/usr)
-
 AC_CANONICAL_HOST
 
 lv_mips=no
@@ -136,7 +134,6 @@ AC_CHECK_LIB([m], [sqrt], [LIBS="-lm $LIBS"],
 	     AC_MSG_ERROR([*** You need the Standard C Math Library to build Libvisual.]))
 
 # Internationalization
-ALL_LINGUAS="es_ES es_AR"
 GETTEXT_PACKAGE=libvisual
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GETTEXT package name])
@@ -349,7 +346,7 @@ elif test x"$LV_THREAD_CFLAGS" != x; then
 fi
 AC_SUBST(VISUAL_PKG_CONFIG_DEP)
 
-VISUAL_LIBS="$LIBS -lvisual"
+VISUAL_LIBS="$LIBS -lvisual-0.3"
 if test x"$LV_THREAD_LIBS" != x; then
   VISUAL_LIBS="$LV_THREAD_LIBS $VISUAL_LIBS"
 fi
@@ -472,7 +469,7 @@ AC_SUBST(LIBS_DYNAMIC_LOADER, "$libs_dynamic_loader")
 
 AC_SUBST(BUILD_SUBDIRS, "libvisual")
 
-LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual"
+LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-0.3"
 AC_SUBST(LIBVISUAL_PLUGINS_BASE_DIR)
 
 dnl Output the LibVisual config file
@@ -804,7 +801,7 @@ AC_CONFIG_FILES([
 m4/Makefile
 po/Makefile.in
 Makefile
-libvisual.pc
+libvisual-0.3.pc
 libvisual/Makefile
 ])
 #
@@ -827,4 +824,3 @@ plugins base dir                     : $plugins_base_dir
 compiler                             : ${CC}
 debug enabled                        : ${debug}
 "
-

libvisual/libvisual.pc.in renamed to libvisual/libvisual-0.3.pc.in

@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/libvisual-0.3
 pluginsbasedir=@LIBVISUAL_PLUGINS_BASE_DIR@
 
 Name: libvisual
@@ -10,4 +10,3 @@ Description: an audio visualisation abstraction library.
 Requires: @VISUAL_PKG_CONFIG_DEP@
 Libs: -L${libdir} @VISUAL_LIBS@
 Cflags: -I${includedir} @VISUAL_CFLAGS@
-

libvisual/libvisual/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to generate a Makefile.in
 
-library_includedir = $(includedir)/libvisual
+library_includedir = $(includedir)/libvisual-0.3/libvisual
 library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
 			  lv_audio.h lv_bin.h lv_common.h lv_fourier.h \
 			  lv_input.h lv_event.h lv_keysym.h \
@@ -15,23 +15,23 @@ library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
 			  lv_hashlist.h lv_cache.h lv_collection.h \
 			  lv_utils.h lv_os.h lv_math.h lv_gl.h lv_defines.h
 
-lib_LTLIBRARIES = libvisual.la
+lib_LTLIBRARIES = libvisual-0.3.la
 
 DEFS = @DEFS@
 
 LIBS += -L. -L$(libdir) $(LV_THREAD_LIBS) @LTLIBINTL@
 
 PLUGPATH = $(libdir)/libvisual
 
-AM_CFLAGS = -DPLUGPATH="\"@LIBVISUAL_PLUGINS_BASE_DIR@\"" \
-	$(LV_THREAD_CFLAGS) 
+AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
+	$(LV_THREAD_CFLAGS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libvisual \
 	   -I$(top_builddir) -I$(top_builddir)/libvisual
 
-libvisual_la_LDFLAGS = -export-dynamic -no-undefined
+libvisual_0_3_la_LDFLAGS = -export-dynamic -no-undefined
 
-libvisual_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
+libvisual_0_3_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
 		       lv_bin.c lv_plugin.c lv_video.c lv_video_simd.c lv_mem.c \
 		       lv_audio.c lv_fourier.c lv_list.c lv_log.c lv_palette.c \
 		       lv_libvisual.c lv_songinfo.c lv_morph.c lv_bmp.c lv_param.c \