Menu
▾
▴
[Gmyth-commits] SF.net SVN: gmyth: [936] trunk/gmyth
|
From: <ren...@us...> - 2008-02-25 18:10:26
|
Revision: 936
http://gmyth.svn.sourceforge.net/gmyth/?rev=936&view=rev
Author: renatofilho
Date: 2008-02-25 10:09:36 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
fixed autotools scripst
Modified Paths:
--------------
trunk/gmyth/Makefile.am
trunk/gmyth/autogen.sh
trunk/gmyth/configure.ac
trunk/gmyth/m4/Makefile.am
Removed Paths:
-------------
trunk/gmyth/common/
Modified: trunk/gmyth/Makefile.am
===================================================================
--- trunk/gmyth/Makefile.am 2008-02-25 18:04:30 UTC (rev 935)
+++ trunk/gmyth/Makefile.am 2008-02-25 18:09:36 UTC (rev 936)
@@ -1,4 +1,5 @@
SUBDIRS= gmyth samples tests
+DIST_SUBDIRS= m4 gmyth samples tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gmyth.pc
Modified: trunk/gmyth/autogen.sh
===================================================================
--- trunk/gmyth/autogen.sh 2008-02-25 18:04:30 UTC (rev 935)
+++ trunk/gmyth/autogen.sh 2008-02-25 18:09:36 UTC (rev 936)
@@ -1,102 +1,19 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-DIE=0
-package=gmyth
-srcfile=configure.ac
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
-# a quick cvs co if necessary to alleviate the pain - may remove this
-# when developers get a clue ;)
-if test ! -d common;
-then
- echo "+ getting common/ from svn"
- svn co common
-fi
+PKG_NAME="gmythdbus"
-# source helper functions
-if test ! -f common/autogen-helper.sh;
-then
- echo There is something wrong with your source tree.
- echo You are missing common/autogen-helper.sh
- exit 1
-fi
-. common/autogen-helper.sh
-
-CONFIGURE_DEF_OPT='--enable-maintainer-mode'
-# uncomment below to disable the UPnP features
-CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --disable-upnp"
-CONFIGURE_EXT_OPT="$@"
-
-autogen_options
-
-echo -n "+ check for build tools"
-if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53" \
- "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 53 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.8 automake-1.7 automake-1.6" \
- "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1
-version_check "libtoolize" "$LIBTOOLIZE libtoolize" \
- "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
-version_check "pkg-config" "" \
- "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
-
-die_check $DIE
-
-aclocal_check || DIE=1
-autoheader_check || DIE=1
-
-die_check $DIE
-
-# if no arguments specified then this will be printed
-if test -z "$*"; then
- echo "+ checking for autogen.sh options"
- echo " This autogen script will automatically run ./configure as:"
- echo " ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT"
- echo " To pass any additional options, please specify them on the $0"
- echo " command line."
-fi
-
-toplevel_check $srcfile
-
-tool_run "$aclocal" "-I m4 $ACLOCAL_FLAGS"
-tool_run "$libtoolize" "--copy --force"
-tool_run "$autoheader"
-
-# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
-echo timestamp > stamp-h.in 2> /dev/null
-
-tool_run "$autoconf"
-tool_run "$automake" "-a -c"
-
-# if enable exists, add an -enable option for each of the lines in that file
-if test -f enable; then
- for a in `cat enable`; do
- CONFIGURE_FILE_OPT="--enable-$a"
- done
-fi
-
-# if disable exists, add an -disable option for each of the lines in that file
-if test -f disable; then
- for a in `cat disable`; do
- CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
- done
-fi
-
-test -n "$NOCONFIGURE" && {
- echo "+ skipping configure stage for package $package, as requested."
- echo "+ autogen.sh done."
- exit 0
+(test -f $srcdir/configure.ac) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
}
-echo "+ running configure ... "
-test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT"
-test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
-test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
-echo
-
-./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
- echo " configure failed"
- exit 1
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
}
-
-echo "Now type 'make' to compile $package."
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh -I./m4
Modified: trunk/gmyth/configure.ac
===================================================================
--- trunk/gmyth/configure.ac 2008-02-25 18:04:30 UTC (rev 935)
+++ trunk/gmyth/configure.ac 2008-02-25 18:09:36 UTC (rev 936)
@@ -121,6 +121,7 @@
AC_OUTPUT(
Makefile
+m4/Makefile
gmyth/Makefile
samples/Makefile
tests/Makefile
Modified: trunk/gmyth/m4/Makefile.am
===================================================================
--- trunk/gmyth/m4/Makefile.am 2008-02-25 18:04:30 UTC (rev 935)
+++ trunk/gmyth/m4/Makefile.am 2008-02-25 18:09:36 UTC (rev 936)
@@ -1,10 +1,5 @@
-SUBDIRS= src pixmaps
-
-include aminclude.am
-
-EXTRA_DIST = \
- autogen.sh \
- AUTHORS \
- COPYING \
- README
-
+EXTRA_DIST = \
+ ac_doxygen.m4 \
+ as-compiler-flag.m4 \
+ as-expand.m4 \
+ as-version.m4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
