Add new check. (AC_OUTPUT): Also generate `macros/Makefile'.
* configure.in (GNOME_X_CHECKS): Add new check. (AC_OUTPUT): Also generate `macros/Makefile'. * Makefile.am (macros/macros.dep): Maintainer rule to auto-regenerate aclocal.m4. (SUBDIRS): Add `macros'. * help-browser/gnome-helpwin.c (gnome_helpwin_load): Replace `snprintf' with `g_snprintf'.
This commit is contained in:
Raja R Harinath
parent
7a5721aaca
commit
9f72873211
5 changed files with 33 additions and 83 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -0,0 +1,19 @@
|
|||
1998-02-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* configure.in (GNOME_X_CHECKS): Add new check.
|
||||
(AC_OUTPUT): Also generate `macros/Makefile'.
|
||||
|
||||
* Makefile.am (macros/macros.dep): Maintainer rule to
|
||||
auto-regenerate aclocal.m4.
|
||||
(SUBDIRS): Add `macros'.
|
||||
|
||||
* help-browser/gnome-helpwin.c (gnome_helpwin_load): Replace
|
||||
`snprintf' with `g_snprintf'.
|
||||
|
||||
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
|
||||
|
||||
* configure.in (AC_OUTPUT): Generate `macros/Makefile'.
|
||||
|
||||
* autogen.sh: Use `macros/autogen.sh'.
|
||||
|
||||
|
||||
|
|
@ -1,2 +1,7 @@
|
|||
SUBDIRS = panel gsm pixmaps po desktop-links desktop-properties intl \
|
||||
help-browser
|
||||
SUBDIRS = intl po panel gsm pixmaps desktop-links desktop-properties \
|
||||
help-browser macros
|
||||
|
||||
## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change
|
||||
@MAINT@include macros/macros.dep
|
||||
@MAINT@macros/macros.dep: macros/Makefile.am
|
||||
@MAINT@ cd macros && $(MAKE) macros.dep
|
||||
|
|
|
|||
|
|
@ -3,5 +3,6 @@
|
|||
#undef HAVE_GETTEXT
|
||||
#undef HAVE_LC_MESSAGES
|
||||
#undef HAVE_STPCPY
|
||||
#undef HAVE_LIBSM
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
|
|
|
|||
84
autogen.sh
84
autogen.sh
|
|
@ -1,63 +1,11 @@
|
|||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
|
||||
DIE=0
|
||||
|
||||
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have "\`autoconf\'" installed to compile Gnome."
|
||||
echo "Download the appropriate package for your distribution,"
|
||||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
(libtool --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have "\`libtool\'" installed to compile Gnome."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have "\`automake\'" installed to compile Gnome."
|
||||
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
NO_AUTOMAKE=yes
|
||||
}
|
||||
|
||||
|
||||
# if no automake, don't bother testing for aclocal
|
||||
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: Missing "\`aclocal\'". The version of "\`automake\'
|
||||
echo "installed doesn't appear recent enough."
|
||||
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
if test "$DIE" -eq 1; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
test -f /opt/lib/libgtk.a \
|
||||
|| test -f /opt/gnome/lib/libgtk.a \
|
||||
|| test -f /usr/lib/libgtk.a \
|
||||
|| test -f /usr/local/lib/libgtk.a \
|
||||
|| cat <<EOF
|
||||
**Warning**: You must have Gtk installed to compile Gnome. I cannot
|
||||
find it installed in the usual places. "configure" may do a better
|
||||
job of finding out if you have it installed. If Gtk is not installed,
|
||||
visit ftp://ftp.gimp.org/pub/gtk/ (or get it out of CVS too).
|
||||
|
||||
EOF
|
||||
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
PKG_NAME="Gnome Core Utilities"
|
||||
|
||||
(test -f $srcdir/configure.in \
|
||||
&& test -f $srcdir/HACKING \
|
||||
&& test -d $srcdir/gsm) || {
|
||||
|
|
@ -66,30 +14,4 @@ test -z "$srcdir" && srcdir=.
|
|||
exit 1
|
||||
}
|
||||
|
||||
if test -z "$*"; then
|
||||
echo "**Warning**: I am going to run "\`configure\'" with no arguments."
|
||||
echo "If you wish to pass any to it, please specify them on the"
|
||||
echo \`$0\'" command line."
|
||||
echo
|
||||
fi
|
||||
|
||||
for I in /usr /usr/local /opt /opt/gnome; do
|
||||
if [ -f $I/lib/gnomeConf.sh ]; then
|
||||
GNOMEINSTDIR="--with-gnome=$I"
|
||||
fi
|
||||
done
|
||||
|
||||
for i in .
|
||||
do
|
||||
echo processing $srcdir/$i
|
||||
(cd $srcdir/$i; \
|
||||
libtoolize --copy --force; \
|
||||
if test -d macros; then aclocal -I macros; else aclocal; fi; \
|
||||
autoheader; \
|
||||
automake --add-missing; \
|
||||
automake --gnu; autoheader; autoconf)
|
||||
done
|
||||
|
||||
echo running $srcdir/configure --enable-maintainer-mode $GNOMEINSTDIR "$@"
|
||||
$srcdir/configure --enable-maintainer-mode $GNOMEINSTDIR "$@" \
|
||||
&& echo Now type \`make\' to compile the Gnome Libraries.
|
||||
. $srcdir/macros/autogen.sh
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ AC_PROG_CXX
|
|||
AC_PROG_LEX
|
||||
AC_DECL_YYTEXT
|
||||
|
||||
GNOME_X_CHECKS
|
||||
|
||||
ALL_LINGUAS=""
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
|
|
@ -53,6 +55,7 @@ AC_SUBST(PROGRAMS_PANEL_CDPLAYER)
|
|||
AC_OUTPUT([
|
||||
Makefile
|
||||
po/Makefile.in
|
||||
macros/Makefile
|
||||
panel/Makefile
|
||||
panel/batmon/Makefile
|
||||
panel/batmon/Makefile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue