X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=75574281ea67849bd046716d24ab4dfcd3c73677;hb=c2e434dec8b7cd3ba31ccbb1f02d6169b5d99f28;hp=b0927b9a7a9c77d37fb05bdf0f5b776fad2112af;hpb=4c7f9a485224681195d482a90337ffe5ada09946;p=vlc

diff --git a/bootstrap b/bootstrap
index b0927b9a7a..75574281ea 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,30 +48,12 @@ fi
 
 # 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"
-  # 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"
-  # 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
@@ -113,9 +95,9 @@ 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
@@ -217,23 +199,12 @@ EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 SUBDIRS = ${subdirs}
 SUFFIXES = _plugin\$(LIBEXT) _plugin.a
-### TODO ought to be defined somewhere else
 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 
 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
@@ -241,13 +212,13 @@ 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; \\
-	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):
-	@mod="\$*" ; mod=\$\${mod:3} ; \
+	@mod="\$*" ; mod=\$\${mod#lib} ; \
 	ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
 	case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
 	  c++)  ld="\$(CXXLINK)" ;; \
@@ -257,8 +228,10 @@ _plugin.a_plugin\$(LIBEXT):
 	echo \$\$ld \$< \$\$ldfl ; \
 	\$\$ld \$< \$\$ldfl
 
+if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
 	cd \$(top_srcdir) && \$(SHELL) ./bootstrap
+endif
 
 mostlyclean-local:
 	-rm -f *.a *\$(LIBEXT)
@@ -424,7 +397,7 @@ set -x
 
 # 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
@@ -468,17 +441,8 @@ set +x
 ##
 ##  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
@@ -486,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
-  ;;
-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
-  ;;
-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
@@ -511,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
-  ;;
-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
@@ -524,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
-  ;;
-esac
+fi