Changeset 453fe58a0617ac1d0c72e7f24b50b97ed9c0e256

Timestamp:

03/17/03 17:59:47 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

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

git-parent:

[78ea76bcf25b3546dc1de2de42877d469ec169bd]

git-author:

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

Message:

• ./autotools/: moved some autotools executables to this subdirectory to
  reduce cluttering of the root directory.
  

Files:

• .cvsignore (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• autotools/.cvsignore (added)
• autotools/Makefile.am (added)
• bootstrap (modified) (2 diffs)
• configure.ac.in (modified) (7 diffs)
• toolbox (modified) (8 diffs)

.cvsignore

@@ -14 +14 @@
-config.rpath
-config.status
-config.guess
-config.sub
-confdefs.h
-conftest.cc
@@ -25 +23 @@
-stamp-h*
-aclocal.m4
-install-sh
-missing
-mkinstalldirs
-compile
-depcomp
-vlc-debug.*
-vlc-log.*

Makefile.am

@@ -7 +7 @@
-# which have makefiles with distribution information.
-SUBDIRS = po intl m4 share
-
+ autotools
-
-EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for the VLC media player
-4 2003/03/12 04:16:02
+5 2003/03/17 16:59:46
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -174 +174 @@
-###
-set -x
-
+
+
+
+
+
+
+
+
+
+
+
-rm -Rf intl
-

configure.ac.in

@@ -8 +8 @@
-AC_PREREQ(2.50)
-AC_CONFIG_SRCDIR(src/libvlc.c)
+AC_CONFIG_AUX_DIR(autotools)
-AC_CANONICAL_SYSTEM
-
@@ -496 +497 @@
-NEED_GTK_MAIN=no
-NEED_GNOME_MAIN=no
+NEED_GTK2_MAIN=no
+NEED_GNOME2_MAIN=no
-
-dnl build the qte plugin ?
@@ -2281 +2284 @@
-
-dnl
+dnl  Gtk+2 module
+dnl
+AC_ARG_ENABLE(gtk2,
+  [  --enable-gtk2           Gtk2 support (default disabled)])
+if test "x${enable_gtk2}" = "xyes"
+then
+  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+  CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}"
+  LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}"
+  PLUGINS="${PLUGINS} gtk2"
+  if test "x${SYS}" != "xmingw32"; then
+    NEED_GTK2_MAIN=yes
+  fi
+fi
+
+dnl
-dnl  Familiar module uses Gtk+ library
-dnl
@@ -2395 +2414 @@
-    CPPFLAGS="${CPPFLAGS_save}"
-  fi])
+
+dnl
+dnl  Gnome2 module
+dnl
+AC_ARG_ENABLE(gnome2,
+  [  --enable-gnome2         Gnome2 support (default disabled)])
+if test "x${enable_gnome2}" = "xyes"
+then
+  PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+  CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}"
+  LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}"
+  PLUGINS="${PLUGINS} gnome2"
+  if test "x${SYS}" != "xmingw32"; then
+    NEED_GNOME2_MAIN=yes
+  fi
+fi
-
-dnl
@@ -2770 +2805 @@
-    PLUGINS="${PLUGINS} gtk_main"
-    CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN"
-   
+    
-    CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}"
-    LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}"
@@ -2780 +2815 @@
-    CFLAGS_gnome_main="${CFLAGS_gnome_main} ${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}"
-    LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
+fi
+
+if test "x${NEED_GTK2_MAIN}" != "xno"
+then
+    PLUGINS="${PLUGINS} gtk2_main"
+    CFLAGS_gtk2="${CFLAGS_gtk2} -DNEED_GTK2_MAIN"
+    CFLAGS_gtk2_main="${CFLAGS_gtk2_main} ${CFLAGS_gtk2}"
+    LDFLAGS_gtk2_main="${LDFLAGS_gtk2_main} ${LDFLAGS_gtk2}"
+fi
+
+if test "x${NEED_GNOME2_MAIN}" != "xno"
+then
+    PLUGINS="${PLUGINS} gnome2_main"
+    CFLAGS_gnome2_main="${CFLAGS_gnome2_main} ${CFLAGS_gtk2} ${CFLAGS_gnome2}"
+    LDFLAGS_gnome2_main="${LDFLAGS_gnome2_main} ${LDFLAGS_gtk2} ${LDFLAGS_gnome2}"
-fi
-
@@ -2921 +2971 @@
-AC_OUTPUT([
-  Makefile
+  autotools/Makefile
-  debian/Makefile
-  doc/Makefile

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-4 2003/03/12 05:12:05
+5 2003/03/17 16:59:46
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -43 +43 @@
-###  argument check
-###
-do_changelog=no
-do_po=no
-do_vc=no
-do_includes=no
-do_glade=no
-
-if test "$1" = ""
@@ -56 +51 @@
-case "$1" in
-  --update-changelog)
-do_changelog=yes
+action=changelog
-    ;;
-  --update-vc)
-do_vc=yes
+action=vc
-    ;;
-  --update-po)
-do_po=yes
+action=po
-    ;;
-  --update-includes)
-do_includes=y
+action=includ
-    ;;
-  --update-glade|--fix-glade)
-do_glade=yes
+action=glade
-    ;;
-  --help)
@@ -83 +78 @@
-##  Update the CVS changelog
-##
-do_changelog" = "yes
+{action}" = "changelog
-then
-  cvs2cl --help >/dev/null 2>&1 || exit 1
@@ -96 +91 @@
-##  Update the MSVC project files
-##
-do_vc" = "yes
+{action}" = "vc
-then
-  echo "generating Visual Studio files..."
@@ -313 +308 @@
-##  Update the potfiles because no one ever does it
-##
-do_po" = "yes
+{action}" = "po
-then
-  # create a fake file containing win32 strings
@@ -337 +332 @@
-##  Create include files
-##
-do_includes" = "y
+{action}" = "includ
-then
-  set -x
@@ -411 +406 @@
-##  Fix glade-generated files
-##
-do_glade" = "yes
+{action}" = "glade
-then
-  for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade