From 453fe58a0617ac1d0c72e7f24b50b97ed9c0e256 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 17 Mar 2003 16:59:47 +0000 Subject: [PATCH] * ./autotools/: moved some autotools executables to this subdirectory to reduce cluttering of the root directory. --- .cvsignore | 7 ------ Makefile.am | 2 +- autotools/.cvsignore | 10 ++++++++ autotools/Makefile.am | 0 bootstrap | 14 ++++++++++-- configure.ac.in | 53 ++++++++++++++++++++++++++++++++++++++++++- toolbox | 27 +++++++++------------- 7 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 autotools/.cvsignore create mode 100644 autotools/Makefile.am diff --git a/.cvsignore b/.cvsignore index 58841c2859..5b4d9774b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,8 +13,6 @@ config.log config.cache config.rpath config.status -config.guess -config.sub confdefs.h conftest.cc autom4te.cache @@ -24,11 +22,6 @@ Modules.am build-stamp stamp-h* aclocal.m4 -install-sh -missing -mkinstalldirs -compile -depcomp vlc-debug.* vlc-log.* vlc-config diff --git a/Makefile.am b/Makefile.am index 8f1f990409..af628089ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. SUBDIRS = po intl m4 share -DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib +DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \ INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \ diff --git a/autotools/.cvsignore b/autotools/.cvsignore new file mode 100644 index 0000000000..8cfac4bc91 --- /dev/null +++ b/autotools/.cvsignore @@ -0,0 +1,10 @@ +.dirstamp +Makefile +Makefile.in +compile +config.guess +config.sub +depcomp +install-sh +missing +mkinstalldirs diff --git a/autotools/Makefile.am b/autotools/Makefile.am new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bootstrap b/bootstrap index 64a6f9926e..4e8ba85cc2 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh ## bootstrap file for the VLC media player -## $Id: bootstrap,v 1.44 2003/03/12 04:16:02 sam Exp $ +## $Id: bootstrap,v 1.45 2003/03/17 16:59:46 sam Exp $ ## ## Authors: Samuel Hocevar @@ -173,7 +173,17 @@ echo "done." ### classic bootstrap stuff ### set -x -rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh ABOUT-NLS + +# remove autotools cruft +rm -f aclocal.m4 configure config.log +# remove old autotools extra cruft +rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh +# remove new autotools extra cruft +(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh) +# remove libtool cruft +rm -f ltmain.sh libtool ltconfig +# remove gettext cruft +rm -f m4/oldgettext.m4 ABOUT-NLS rm -Rf intl # Check for gettext diff --git a/configure.ac.in b/configure.ac.in index 89d437cd18..4f97cf1f24 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,6 +7,7 @@ CODENAME="Natalya" AC_PREREQ(2.50) AC_CONFIG_SRCDIR(src/libvlc.c) +AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM dnl XXX: we don't put any flags here, because automake 1.5 doesn't support @@ -495,6 +496,8 @@ fi dnl Build the gtk_main plugins? NEED_GTK_MAIN=no NEED_GNOME_MAIN=no +NEED_GTK2_MAIN=no +NEED_GNOME2_MAIN=no dnl build the qte plugin ? NEED_QTE_MAIN=no @@ -2279,6 +2282,22 @@ then fi fi +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,6 +2414,22 @@ developement tools or remove the --enable-gnome option]) 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 dnl wxWindows module dnl @@ -2769,7 +2804,7 @@ if test "x${NEED_GTK_MAIN}" != "xno" then PLUGINS="${PLUGINS} gtk_main" CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN" - CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN" + CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN" CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}" LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}" fi @@ -2781,6 +2816,21 @@ then 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 + dnl dnl qte_main plugin dnl @@ -2920,6 +2970,7 @@ AC_SUBST(LDFLAGS_mozilla) AC_OUTPUT([ Makefile + autotools/Makefile debian/Makefile doc/Makefile intl/Makefile diff --git a/toolbox b/toolbox index fd81997966..4a84151671 100755 --- a/toolbox +++ b/toolbox @@ -1,7 +1,7 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.14 2003/03/12 05:12:05 sam Exp $ +## $Id: toolbox,v 1.15 2003/03/17 16:59:46 sam Exp $ ## ## Authors: Samuel Hocevar @@ -42,11 +42,6 @@ getfiles() ### ### argument check ### -do_changelog=no -do_po=no -do_vc=no -do_includes=no -do_glade=no if test "$1" = "" then @@ -55,19 +50,19 @@ fi 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=yes + action=includes ;; --update-glade|--fix-glade) - do_glade=yes + action=glade ;; --help) help @@ -82,7 +77,7 @@ shift ## ## Update the CVS changelog ## -if test "$do_changelog" = "yes" +if test "${action}" = "changelog" then cvs2cl --help >/dev/null 2>&1 || exit 1 rm -f ChangeLog @@ -95,7 +90,7 @@ fi ## ## Update the MSVC project files ## -if test "$do_vc" = "yes" +if test "${action}" = "vc" then echo "generating Visual Studio files..." @@ -311,7 +306,7 @@ fi ## ## Update the potfiles because no one ever does it ## -if test "$do_po" = "yes" +if test "${action}" = "po" then # create a fake file containing win32 strings rm -f modules/gui/win32/strings.cpp @@ -335,7 +330,7 @@ fi ## ## Create include files ## -if test "$do_includes" = "yes" +if test "${action}" = "includes" then set -x @@ -409,7 +404,7 @@ fi ## ## Fix glade-generated files ## -if test "$do_glade" = "yes" +if test "${action}" = "glade" then for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade do -- 2.39.2