summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh35
2 files changed, 3 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index e574d5ca8..17c74b1fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
1SUBDIRS = src data doc config 1SUBDIRS = src data doc config
2 2
3ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
4
3if HAVE_PO 5if HAVE_PO
4 6
5SUBDIRS += po 7SUBDIRS += po
@@ -70,8 +72,6 @@ EXTRA_DIST = config.rpath README AUTHORS COPYING \
70filesdir = $(datadir)/enlightenment/ 72filesdir = $(datadir)/enlightenment/
71files_DATA = AUTHORS COPYING 73files_DATA = AUTHORS COPYING
72 74
73ACLOCAL_AMFLAGS = -I m4
74
75pkgconfigdir = $(libdir)/pkgconfig 75pkgconfigdir = $(libdir)/pkgconfig
76pkgconfig_DATA = enlightenment.pc 76pkgconfig_DATA = enlightenment.pc
77 77
diff --git a/autogen.sh b/autogen.sh
index b814903b8..9b3aff66c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3rm -rf autom4te.cache 3autoreconf --symlink --install
4rm -f aclocal.m4 ltmain.sh
5
6touch README
7touch ABOUT-NLS
8
9echo "Running autopoint..." ; autopoint -f || :
10echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
11echo "Running autoheader..." ; autoheader || exit 1
12echo "Running autoconf..." ; autoconf || exit 1
13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
14echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
15
16W=0
17
18rm -f config.cache-env.tmp
19echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
20echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
21echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
22echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
23echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
24
25cmp config.cache-env.tmp config.cache-env >> /dev/null
26if [ $? -ne 0 ]; then
27 W=1;
28fi
29
30if [ $W -ne 0 ]; then
31 echo "Cleaning configure cache...";
32 rm -f config.cache config.cache-env
33 mv config.cache-env.tmp config.cache-env
34else
35 rm -f config.cache-env.tmp
36fi
37 4
38if [ -z "$NOCONFIGURE" ]; then 5if [ -z "$NOCONFIGURE" ]; then
39 ./configure -C "$@" 6 ./configure -C "$@"