Changeset f53fe2616cba88c32648098ae3d69e0f221091b1

Timestamp:

07/01/03 21:17:32 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1057087052 +0000

git-parent:

[dceb44290badf3c971a0d6ef87999d9e041623b7]

git-author:

Sam Hocevar <sam@videolan.org> 1057087052 +0000

Message:

• configure.ac:
  + Fixed a == test bashism.
  + Cosmetic changes.
  
• toolbox, vlc-config.in.in: Cosmetic changes.
  
• Makefile.am: Fixed the Mozilla plugin build (happy bootstrap).
  

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (37 diffs)
• doc/fortunes.txt (modified) (2 diffs)
• toolbox (modified) (3 diffs)
• vlc-config.in.in (modified) (4 diffs)

Makefile.am

@@ -591 +591 @@
-mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
-                               $(CPPFLAGS_mozilla_EXTRA) -Imozilla
- builtins_pic
+
-
-BUILT_SOURCES_mozilla = mozilla/vlcintf.h

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-0 2003/07/01 17:46:50
+1 2003/07/01 19:17:32
-
-AC_INIT(vlc,0.6.0)
@@ -911 +911 @@
-[  --with-tuning=ARCH      enable special tuning for an architecture
-                          (default i686 on IA-32 and 750 on PPC)])
-"${with_tuning}" != "
+-n "${with_tuning}
-    if test "${target_cpu}" = "powerpc"; then
-        CFLAGS_TUNING="-mtune=${with_tuning}"
@@ -1003 +1003 @@
-  case "${with_dvdcss}" in
-  ""|yes)
-"${with_dvdcss_tree}" = "
+-z "${with_dvdcss_tree}
-    then
-      AC_CHECK_HEADERS(dvdcss/dvdcss.h,
@@ -1013 +1013 @@
-      AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree})
-      real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`"
-"${real_dvdcss_tree}" = "
+-z "${real_dvdcss_tree}
-      then
-        dnl  The given directory can't be found
@@ -1068 +1068 @@
-  AC_ARG_WITH(dvdread-tree,
-  [    --with-dvdread-tree=PATH libdvdread tree for static linking])
-"${with_dvdread}" = "
-
-"${with_dvdread_tree}" = "
+-z "${with_dvdread}
+
+-z "${with_dvdread_tree}
-    then
-      AC_CHECK_HEADERS(dvdread/dvd_reader.h,
@@ -1076 +1076 @@
-          AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}])
-        ],[
-"${enable_dvdread}" != "
+-n "${enable_dvdread}
-          then
-            AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml])
@@ -1085 +1085 @@
-      AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
-      real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
-"${real_dvdread_tree}" = "
+-z "${real_dvdread_tree}
-      then
-        dnl  The given directory can't be found
@@ -1132 +1132 @@
-  AC_ARG_WITH(dvdplay-tree,
-  [    --with-dvdplay-tree=PATH libdvdplay tree for static linking])
-"${with_dvdplay}" = "
-
-"${with_dvdplay_tree}" = "
+-z "${with_dvdplay}
+
+-z "${with_dvdplay_tree}
-    then
-      AC_CHECK_HEADERS(dvdplay/dvdplay.h,[
@@ -1141 +1141 @@
-          AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}])
-        ],[
-"${enable_dvdplay}" != "
+-n "${enable_dvdplay}
-          then
-            AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.])
@@ -1150 +1150 @@
-      AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree})
-      real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`"
-"${real_dvdplay_tree}" = "
+-z "${real_dvdplay_tree}
-      then
-        dnl  The given directory can't be found
@@ -1199 +1199 @@
-  case "${with_dvbpsi}" in
-  ""|yes)
-"${with_dvbpsi_tree}" = "
+-z "${with_dvbpsi_tree}
-    then
-      AC_CHECK_HEADERS(dvbpsi/dr.h,
@@ -1217 +1217 @@
-      AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
-      real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`"
-"${real_dvbpsi_tree}" = "
+-z "${real_dvbpsi_tree}
-      then
-        dnl  The given directory can't be found
@@ -1242 +1242 @@
-  *)
-    AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi})
-"${with_dvbpsi}" = "
+-z "${with_dvbpsi}
-    then
-      LDFLAGS_test=""
@@ -1257 +1257 @@
-
-    ],[
-"${enable_dvbpsi}" != "
+-n "${enable_dvbpsi}
-      then
-        AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
@@ -1276 +1276 @@
-  AC_ARG_WITH(v4l,
-    [    --with-v4l=PATH       path to a v4l-enabled kernel tree],[],[])
-"${with_v4l}" != "
+-n "${with_v4l}
-  then
-    AX_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
@@ -1436 +1436 @@
-  AC_ARG_WITH(mad,
-    [    --with-mad=PATH       path to libmad],[],[])
-"${with_mad}" != "
+-n "${with_mad}
-  then
-    AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
@@ -1444 +1444 @@
-  AC_ARG_WITH(mad-tree,
-    [    --with-mad-tree=PATH  mad tree for static linking],[],[])
-"${with_mad_tree}" != "
+-n "${with_mad_tree}
-  then
-    real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
-"${real_mad_tree}" = "
+-z "${real_mad_tree}
-    then
-      dnl  The given directory can't be found
@@ -1506 +1506 @@
-  dnl test for !(--with-ffmpeg-tree)
-  dnl
-= "no" -o "${with_ffmpeg_tree}" == "
+ "no" -o -z "${with_ffmpeg_tree}
-    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
-    LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
@@ -1524 +1524 @@
-  dnl test for --with-ffmpeg-tree
-  dnl
-"${with_ffmpeg_tree}" != "
+-n "${with_ffmpeg_tree}
-    AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree})
-    real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
-"${real_ffmpeg_tree}" = "
+-z "${real_ffmpeg_tree}
-      dnl  The given directory can't be found
-      AC_MSG_RESULT(no)
@@ -1568 +1568 @@
-  AC_ARG_WITH(faad-tree,
-  [    --with-faad-tree=PATH faad tree for static linking])
-"${with_faad_tree}" != "
+-n "${with_faad_tree}
-  then
-    AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
-    real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`"
-"${real_faad_tree}" = "
+-z "${real_faad_tree}
-    then
-      dnl  The given directory can't be found
@@ -1626 +1626 @@
-  AC_ARG_WITH(xvid,
-    [    --with-xvid=PATH      path to xvid installation],[],[])
-"${with_xvid}" != "
+-n "${with_xvid}
-  then
-    AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
@@ -1634 +1634 @@
-  AC_ARG_WITH(xvid-tree,
-  [    --with-xvid-tree=PATH xvid tree for static linking])
-"${with_xvid_tree}" != "
+-n "${with_xvid_tree}
-  then
-    AC_MSG_CHECKING(for libxvidcore.a in ${with_xvid_tree})
-    real_xvid_tree="`cd ${with_xvid_tree} 2>/dev/null && pwd`"
-"${real_xvid_tree}" = "
+-z "${real_xvid_tree}
-    then
-      dnl  The given directory can't be found
@@ -1716 +1716 @@
-  AC_ARG_WITH(a52-tree,
-    [    --with-a52-tree=PATH  a52dec tree for static linking ],[],[])
-"${with_a52_tree}" != "
+-n "${with_a52_tree}
-  then
-    real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
-"${real_a52_tree}" = "
+-z "${real_a52_tree}
-    then
-      dnl  The given directory can't be found
@@ -1751 +1751 @@
-    fi
-  else
-"${with_a52}" = "
+-z "${with_a52}
-    then
-      LDFLAGS_test=""
@@ -1810 +1810 @@
-  AC_ARG_WITH(libmpeg2-tree,
-  [    --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
-"${with_libmpeg2_tree}" != "
+-n "${with_libmpeg2_tree}
-  then
-    AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree})
-    real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`"
-"${real_libmpeg2_tree}" = "
+-z "${real_libmpeg2_tree}
-    then
-      dnl  The given directory can't be found
@@ -1892 +1892 @@
-  AC_ARG_WITH(tarkin-tree,
-  [    --with-tarkin-tree=PATH tarkin tree for static linking])
-"${with_tarkin_tree}" != "
+-n "${with_tarkin_tree}
-  then
-    AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
@@ -2049 +2049 @@
-                               e.g use as:
-                               --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
-"${with_sdl_prefix}" != "
+-n "${with_sdl_prefix}
-  then
-    SDL_PREFIX="--prefix=${with_sdl_prefix}"
@@ -2122 +2122 @@
-  AC_ARG_WITH(qte,
-  [    --with-qte=PATH       Qt Embedded headers and libraries])
-"${with_qte}" != "
+-n "${with_qte}
-  then
-    AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
@@ -2150 +2150 @@
-    AC_ARG_WITH(directx,
-    [    --with-directx=PATH   Win32 DirectX headers])
-"${with_directx}" = "
+-z "${with_directx}
-    then
-      AC_CHECK_HEADERS(ddraw.h,
@@ -2215 +2215 @@
-  AC_ARG_WITH(ggi,
-    [    --with-ggi=PATH       path to libggi],
-"${with_ggi}" != "
+-n "${with_ggi}
-      then
-        AX_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
@@ -2234 +2234 @@
-  AC_ARG_WITH(glide,
-    [    --with-glide=PATH     path to libglide],
-"${with_glide}" != "
+-n "${with_glide}
-      then
-        AX_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
@@ -2557 +2557 @@
-                          e.g use as:
-                          --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
-"${with_gtk_prefix}" != "
+-n "${with_gtk_prefix}
-  then
-    GTK_PREFIX="--prefix=${with_gtk_prefix}"
@@ -2585 +2585 @@
-    AC_ARG_WITH(gpe-prefix,
-    [    --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[])
- -a "${with_gpe_prefix}" != "
+-a -n "${with_gpe_prefix}
-    then
-      AX_ADD_CFLAGS([gpe],[-I${with_gpe_prefix}/include])
@@ -2770 +2770 @@
-     AC_ARG_WITH(qte,
-     [    --with-qte=PATH       Qt Embedded headers and libraries])
-"${with_qte}" != "
+-n "${with_qte}
-     then
-       AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
@@ -2788 +2788 @@
-     AX_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}])
-     AX_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}])
-"${with_qte}" != "
+-n "${with_qte}
-     then
-       MOC=${with_qte}/bin/moc
@@ -2865 +2865 @@
-  AC_ARG_WITH(slp,
-  [    --with-slp=PATH       libslp headers and libraries])
-"${with_slp}" = "
+-z "${with_slp}
-  then
-    AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
@@ -2989 +2989 @@
-    AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
-    dnl Not necessarily in ${PATH}
-"${XPIDL}" = "
+-z "${XPIDL}
-    then
-      XPIDL="/usr/lib/mozilla/xpidl"

doc/fortunes.txt

@@ -473 +473 @@
-<[MaDog]> xcuse me
-*** Signoff: [MaDog] (Client Quit)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-  -- #videolan
@@ -490 +491 @@
-  -- #videolan
-%
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-5 2003/07/01 12:01:2
+6 2003/07/01 19:17:3
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -408 +408 @@
-
-  rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
-"${BUILTINS}" != "
+-n "${BUILTINS}
-  then
-    for i in `echo ${BUILTINS}`
@@ -419 +419 @@
-  echo "    do \\" >> ${file}.tmp
-  echo "    { \\" >> ${file}.tmp
-"${BUILTINS}" != "
+-n "${BUILTINS}
-  then
-    for i in `echo ${BUILTINS}`

vlc-config.in.in

@@ -217 +217 @@
-#  If a module was requested, use its name
-#
-"${module}" != "
+-n "${module}
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
-fi
@@ -225 +225 @@
-#
-if test "${echo_linkage}" = yes; then
-
+ = yes
-    for module in `echo "${plugins}"`; do
-      register_flags "${module}"
-    done
-  fi
-
+ = yes
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
@@ -240 +240 @@
-
-if test "${echo_target}" = yes; then
-
+ = yes
-    for module in `echo "${plugins}"`; do
-      register_targets "${module}"
-    done
-${list}
+"${list}"
-    printf '\n'
-  fi
-
+ = yes
-    for module in `echo "${builtins}"`; do
-      register_targets "${module}"
-    done
-
-${list}
+ = yes
+"${list}"
-    else
-${list}
+"${list}"
-    fi
-    printf '\n'
@@ -280 +280 @@
-fi
-if test "${echo_libs}" = yes; then
-
+ = yes
-    for module in `echo "${builtins}"`; do
-      register_targets "${module}"
-      register_flags "${module}"
-    done
-
-${list}
+ = yes
+"${list}"
-    else
-${list}
+"${list}"
-    fi
-    printf '\n'
-  fi
-  echo "${libs} ${ldflags}"