sorry for this quick fix again, I'll need some coffee (fixed svn:keywords and the...

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index b29bbc40373e7110f2e26e7beaea3f3ddd72db21..4a9e423b6b3e676ba86eac4f317a9e965d038daa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -48,30 +48,12 @@ fi
 
 # Check for automake
 amvers="none"
 
 # Check for automake
 amvers="none"

-if automake-1.8 --version >/dev/null 2>&1; then
-  amvers="-1.8"
-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi
-elif automake-1.9 --version >/dev/null 2>&1; then
+if automake-1.9 --version >/dev/null 2>&1; then

   amvers="-1.9"
   amvers="-1.9"

-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi
+elif automake-1.8 --version >/dev/null 2>&1; then
+  amvers="-1.8"

 elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
 elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"

-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi

 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
   if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
   if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then


@@ -113,9 +95,9 @@ else
   autopoint=:
   GETTEXT=old
 fi;else
   autopoint=:
   GETTEXT=old
 fi;else

-  # we don't have gettext. grmbl. try to continue anyway.
-  autopoint=:
-  GETTEXT=no
+  set +x
+  echo "you need gettextize (package gettext-devel or gettext)"
+  exit 1

 fi
 
 # Check for pkg-config
 fi
 
 # Check for pkg-config


@@ -145,8 +127,8 @@ dnl  Private VLC macros - generated by bootstrap
 EOF
 
 if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
 EOF
 
 if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF

-dnl  User does not have pkg-config, so this is a no-op
-AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], [])
+dnl  User does not have pkg-config, so assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])

 
 EOF
 fi
 
 EOF
 fi


@@ -223,16 +205,6 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
 EXTRA_LIBRARIES = ${extra_libs}
 include Modules.am
 
 EXTRA_LIBRARIES = ${extra_libs}
 include Modules.am
 

-if !BUILD_MOZILLA
-pic = no
-else
-if HAVE_WIN32
-### There's no need for pic code on win32 so get rid of this to substantially
-### reduce the compilation time.
-pic = no
-endif
-endif
-

 all: all-modules
 
 # Find out which modules were enabled and tell make to build them
 all: all-modules
 
 # Find out which modules were enabled and tell make to build them


@@ -240,14 +212,14 @@ all-modules:
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
        if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
        if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\
        @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
        if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
        if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\

-       if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
+       if test "\$(pic)" = "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\

        \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
        test -z "\$\$fail"
 
 # Build a plugin with the adequate linker and linker's flags
 _plugin.a_plugin\$(LIBEXT):
        \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
        test -z "\$\$fail"
 
 # Build a plugin with the adequate linker and linker's flags
 _plugin.a_plugin\$(LIBEXT):

-       @mod="\$*" ; mod=\$\${mod:3} ; \
-       ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u vlc_entry__0_8_2" ; \
+       @mod="\$*" ; mod=\$\${mod#lib} ; \
+       ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \

        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \
          objc) ld="\$(OBJCLINK)" ;; \
        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \
          objc) ld="\$(OBJCLINK)" ;; \


@@ -256,8 +228,10 @@ _plugin.a_plugin\$(LIBEXT):
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
 
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
 

+if MAINTAINER_MODE

 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
        cd \$(top_srcdir) && \$(SHELL) ./bootstrap
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
        cd \$(top_srcdir) && \$(SHELL) ./bootstrap

+endif

 
 mostlyclean-local:
        -rm -f *.a *\$(LIBEXT)
 
 mostlyclean-local:
        -rm -f *.a *\$(LIBEXT)


@@ -265,13 +239,13 @@ mostlyclean-local:
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules

-       \$(mkdir_p) "\$(DESTDIR)\$(libvlcdir)"
+       mkdir -p -- "\$(DESTDIR)\$(libvlcdir)"

        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \
        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \

-             echo \$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
-             \$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+             echo \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
+             \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \

              ;; \
          esac; \
        done
              ;; \
          esac; \
        done


@@ -279,8 +253,8 @@ install-exec-local: all-modules
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \

-             echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-             \$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+             echo \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
+             \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \

              ;; \
          esac; \
        done
              ;; \
          esac; \
        done


@@ -289,8 +263,8 @@ if BUILD_MOZILLA
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \
        for mod in \$(mods); do \
          case "\$\$z " \
            in *\ \$\${mod}\ *) \

-             echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-             \$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+             echo \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
+             \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \

              ;; \
          esac; \
        done
              ;; \
          esac; \
        done


@@ -423,7 +397,7 @@ set -x
 
 # remove autotools cruft
 rm -f aclocal.m4 configure config.log config.h config.h.in
 
 # remove autotools cruft
 rm -f aclocal.m4 configure config.log config.h config.h.in

-rm -Rf autom4te.cache
+rm -Rf autom4te*.cache

 # remove old autotools extra cruft
 rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
 # remove new autotools extra cruft
 # remove old autotools extra cruft
 rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
 # remove new autotools extra cruft


@@ -467,17 +441,8 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##

-case "${GETTEXT}" in
-  yes) ;;
-  no) cat << EOF
-
-===========================================================
-IMPORTANT NOTE: you do not have gettext installed on your
-system. The vlc build will work, but you will not have
-internationalization support. We suggest installing gettext.
-EOF
-  ;;
-  old) cat << EOF
+if [ "${GETTEXT}" = "old" ]; then
+  cat << EOF

 
 ==========================================================
 NOTE: you have an old version of gettext installed on your
 
 ==========================================================
 NOTE: you have an old version of gettext installed on your


@@ -485,24 +450,20 @@ system. The vlc build will work, but if your system does not
 have libintl you will not have internationalization support.
 We suggest upgrading to gettext 0.11.5 or later.
 EOF
 have libintl you will not have internationalization support.
 We suggest upgrading to gettext 0.11.5 or later.
 EOF

-  ;;
-esac
+fi

 
 

-case "$PKGCONFIG" in
-  yes) ;;
-  no) cat << EOF
+if [ "$PKGCONFIG" = "no" ]; then
+  cat << EOF

 
 ==============================================================
 NOTE: you do not have the "pkg-config" utility on your system;
 detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
 reliable.
 EOF
 
 ==============================================================
 NOTE: you do not have the "pkg-config" utility on your system;
 detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
 reliable.
 EOF

-  ;;
-esac
+fi

 
 

-case "$AUTOMAKESUCKS" in
-  no) ;;
-  yes) cat << EOF
+if [ "$AUTOMAKESUCKS" = "yes" ]; then
+  cat << EOF

 
 =============================================================
 IMPORTANT NOTE: your version of automake has a bug which will
 
 =============================================================
 IMPORTANT NOTE: your version of automake has a bug which will


@@ -510,12 +471,10 @@ prevent proper plugin compilation. Either compile VLC with
 the --disable-plugins flag, or use a version of automake newer
 than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
 EOF
 the --disable-plugins flag, or use a version of automake newer
 than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
 EOF

-  ;;
-esac
+fi

 
 

-case "$INSTALLSUCKS" in
-  no) ;;
-  yes) cat << EOF
+if [ "$INSTALLSUCKS" = "yes" ]; then
+  cat << EOF

 
 =============================================================
 IMPORTANT NOTE: your version of automake has a bug which will
 
 =============================================================
 IMPORTANT NOTE: your version of automake has a bug which will


@@ -523,6 +482,5 @@ prevent proper installation. Do not use "make install" with this
 version of automake, or use a version of automake newer than 1.5
 (such as 1.6 or 1.7).
 EOF
 version of automake, or use a version of automake newer than 1.5
 (such as 1.6 or 1.7).
 EOF

-  ;;
-esac
+fi