Make the versioning opt-in

diff --git a/Makefile b/Makefile
index 02732640917267bb6299208eed2a1222fcf0c8b6..cf10b4421deef0c728afbb20786d9beebb743c3b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,13 @@ install:
        install -d "$(DESTDIR)$(prefix)/include"
        install -d "$(DESTDIR)$(libdir)"
        install -d "$(DESTDIR)$(moduledir)"
-ifeq ($(compat_dirs), true)
-       ln -s "$(moduledir)" "$(DESTDIR)$(libdir)/mlt"
+ifeq ($(extra_versioning), true)
+       ln -s "$(moduledir)" "$(DESTDIR)$(unversionedmoduledir)"
 endif
        install -d "$(DESTDIR)$(libdir)/pkgconfig"
        install -d "$(DESTDIR)$(mltdatadir)"
-ifeq ($(compat_dirs), true)
-       ln -s "$(mltdatadir)" "$(DESTDIR)$(prefix)/share/mlt"
+ifeq ($(extra_versioning), true)
+       ln -s "$(mltdatadir)" "$(DESTDIR)$(unversionedmltdatadir)"
 endif
        install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
        list='$(SUBDIRS)'; \

diff --git a/configure b/configure
index e935e19cdb69bff2dabb44593a15074a382858db..23521d16645ba32b67dbeed0dc0ddef668eb2168 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,23 +14,23 @@ Help options:
 
 General build options:
 
-  --prefix=directory      - install prefix for path (default: $prefix)
-  --libdir=directory      - lib directory (default: $prefix/lib)
-  --datadir=directory     - data directory (default: $prefix/share)
-  --mandir=directory      - man documentation directory (default: $prefix/share/man)
-  --rename-melt           - Give melt executable a different name.
-  --no-compat-dirs        - Do not create compatibility, unversioned, files and directories
-  --enable-gpl            - Enable GPLv2 components
-  --enable-gpl3           - Enable GPLv3 components
-  --enable-debug          - Compile without optimizations support (default: off)
-  --disable-debug         - Compile without debug support (default: on)
-  --disable-mmx           - Compile without MMX support (default: on)
-  --disable-sse           - Compile without SSE support (default: on)
-  --disable-sse2          - Compile without SSE2 support (default: on)
-  --arch='arch'           - Compile for a specific architecture (default: none)
-  --cpu='cpu'             - Compile for a specific CPU (default: none)
-  --target-os='os'        - Cross-compile to a specific OS (default: $(uname -s))
-  --target-arch='arch'    - Cross-compile to a specific CPU architecture
+  --prefix=directory         - install prefix for path (default: $prefix)
+  --libdir=directory         - lib directory (default: $prefix/lib)
+  --datadir=directory        - data directory (default: $prefix/share)
+  --mandir=directory         - man documentation directory (default: $prefix/share/man)
+  --rename-melt              - Give melt executable a different name (it will not be versioned)
+  --enable-extra-versioning  - Version melt and the data and modules directories
+  --enable-gpl               - Enable GPLv2 components
+  --enable-gpl3              - Enable GPLv3 components
+  --enable-debug             - Compile without optimizations support (default: off)
+  --disable-debug            - Compile without debug support (default: on)
+  --disable-mmx              - Compile without MMX support (default: on)
+  --disable-sse              - Compile without SSE support (default: on)
+  --disable-sse2             - Compile without SSE2 support (default: on)
+  --arch='arch'              - Compile for a specific architecture (default: none)
+  --cpu='cpu'                - Compile for a specific CPU (default: none)
+  --target-os='os'           - Cross-compile to a specific OS (default: $(uname -s))
+  --target-arch='arch'       - Cross-compile to a specific CPU architecture
 
 Module disable options:
 
@@ -57,8 +57,8 @@ build_config()
                echo "bindir=$prefix/bin"
                echo "datadir=$datadir"
                echo "mandir=$mandir"
-               echo "compat_dirs=$compat_dirs"
-               echo "compat_nomelt=$compat_nomelt"
+               echo "extra_versioning=$extra_versioning"
+               echo "melt_noversion=$melt_noversion"
                echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
@@ -132,8 +132,10 @@ build_config()
                ;;
                esac
                echo "LIBSUF=$LIBSUF"
-               echo "moduledir=${libdir}/mlt-${soversion}"
-               echo "mltdatadir=${datadir}/mlt-${soversion}"
+               echo "moduledir=${moduledir}"
+               echo "mltdatadir=${mltdatadir}"
+               echo "unversionedmoduledir=${unversionedmoduledir}"
+               echo "unversionedmltdatadir=${unversionedmltdatadir}"
                echo "meltname=${meltname}"
        ) > config.mak
 
@@ -162,8 +164,8 @@ build_pkgconfig()
                echo version=$version
                echo cflags=`grep ^framework packages.dat | cut -f 2`
                echo libs=`grep ^framework packages.dat | cut -f 3`
-               echo moduledir=${libdir}/mlt-${soversion}
-               echo mltdatadir=${datadir}/mlt-${soversion}
+               echo moduledir=${moduledir}
+               echo mltdatadir=${mltdatadir}
                echo meltbin=${prefix}/bin/${meltname}
        ) >> mlt-framework.pc
        cat mlt-framework.pc.in >>mlt-framework.pc
@@ -204,8 +206,8 @@ export cpu=
 export targetos=$(uname -s)
 export targetarch=
 export amd64=false
-export compat_dirs=true
-export compat_nomelt=false
+export extra_versioning=false
+export melt_noversion=false
 
 # Define the compiler used in tests (gcc is not installed everywhere)
 : ${CC:=gcc}
@@ -214,30 +216,35 @@ export compat_nomelt=false
 for i in "$@"
 do
        case $i in
-               --help )                help=1 ;;
-               --prefix=* )            prefix="${i#--prefix=}" ;;
-               --libdir=* )            libdir="${i#--libdir=}" ;;
-               --datadir=* )           datadir="${i#--datadir=}" ;;
-               --mandir=* )            mandir="${i#--mandir=}" ;;
-               --rename-melt=* )       meltname="${i#--rename-melt=}"; compat_nomelt=true ;;
-               --no-compat-dirs )      compat_dirs=false ;;
-               --enable-debug )        optimisations=false ;;
-               --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false; sse=false; sse2=false ;;
-               --disable-sse )         sse=false; sse2=false ;;
-               --disable-sse2 )        sse2=false ;;
-               --enable-gpl )          gpl=true ;;
-               --enable-gpl3 )         gpl3=true ;;
-               --arch=* )              arch="${i#--arch=}" ;;
-               --cpu=* )               cpu="${i#--cpu=}" ;;
-               --target-os=* )         targetos="${i#--target-os=}" ;;
-               --target-arch=* )       targetarch="${i#--target-arch=}" ;;
+               --help )                        help=1 ;;
+               --prefix=* )                    prefix="${i#--prefix=}" ;;
+               --libdir=* )                    libdir="${i#--libdir=}" ;;
+               --datadir=* )                   datadir="${i#--datadir=}" ;;
+               --mandir=* )                    mandir="${i#--mandir=}" ;;
+               --rename-melt=* )               meltname="${i#--rename-melt=}"; melt_noversion=true ;;
+               --enable-extra-versioning )     extra_versioning=true ;;
+               --enable-debug )                optimisations=false ;;
+               --disable-debug )               debug=false ;;
+               --disable-mmx )                 mmx=false; sse=false; sse2=false ;;
+               --disable-sse )                 sse=false; sse2=false ;;
+               --disable-sse2 )                sse2=false ;;
+               --enable-gpl )                  gpl=true ;;
+               --enable-gpl3 )                 gpl3=true ;;
+               --arch=* )                      arch="${i#--arch=}" ;;
+               --cpu=* )                       cpu="${i#--cpu=}" ;;
+               --target-os=* )                 targetos="${i#--target-os=}" ;;
+               --target-arch=* )               targetarch="${i#--target-arch=}" ;;
        esac
 done
 
 if [ -z "${meltname}" ]
 then
-       meltname=melt${soversion}
+       if [ "$extra_versioning" = "false" ]
+       then
+               meltname=melt
+       else
+               meltname=melt${soversion}
+       fi
 fi
 
 # Chose appropriate suffix for libraries
@@ -272,8 +279,16 @@ export LIBSUF
 [ "$datadir" = "" ] && datadir=$prefix/share
 [ "$mandir" = "" ] && mandir=$prefix/share/man
 
+export unversionedmoduledir=${libdir}/mlt
+export unversionedmltdatadir=${datadir}/mlt
+if [ "$extra_versioning" = "false" ]
+then
+export moduledir=${libdir}/mlt
+export mltdatadir=${datadir}/mlt
+else
 export moduledir=${libdir}/mlt-${soversion}
 export mltdatadir=${datadir}/mlt-${soversion}
+fi
 
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]

diff --git a/src/melt/Makefile b/src/melt/Makefile
index 39e8363cb4cc12171613f101fd21465e663ae17e..acac736e3d174d4301f8a4b35de849c1bd285db4 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -34,16 +34,16 @@ clean:
 install:       all
        install -d "$(DESTDIR)$(bindir)"
        install -c -m 755 $(meltname) "$(DESTDIR)$(bindir)"
-ifeq ($(compat_dirs), true)
-ifneq ($(compat_nomelt), true)
+ifeq ($(extra_versioning), true)
+ifeq ($(melt_noversion), false)
        ln -s $(meltname) "$(DESTDIR)$(bindir)/melt"
 endif
 endif
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)/$(meltname)"
-ifeq ($(compat_dirs), true)
-ifneq ($(compat_nomelt), true)
+ifeq ($(extra_versioning), true)
+ifeq ($(melt_noversion), false)
        rm -f "$(DESTDIR)$(bindir)/melt"
 endif
 endif