diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/.cvsignore | 4 | ||||
-rw-r--r-- | macros/ChangeLog | 101 | ||||
-rw-r--r-- | macros/Makefile.am | 10 | ||||
-rw-r--r-- | macros/aclocal-include.m4 | 10 | ||||
-rw-r--r-- | macros/autogen.sh | 89 | ||||
-rw-r--r-- | macros/gnome-guile-checks.m4 | 23 | ||||
-rw-r--r-- | macros/gnome-objc-checks.m4 | 64 | ||||
-rw-r--r-- | macros/gnome-pthread-check.m4 | 7 | ||||
-rw-r--r-- | macros/gnome-support.m4 | 14 | ||||
-rw-r--r-- | macros/gnome-x-checks.m4 | 90 | ||||
-rw-r--r-- | macros/gnome.m4 | 47 |
11 files changed, 0 insertions, 459 deletions
diff --git a/macros/.cvsignore b/macros/.cvsignore deleted file mode 100644 index 1a58525e..00000000 --- a/macros/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -macros.dep - diff --git a/macros/ChangeLog b/macros/ChangeLog deleted file mode 100644 index e101b872..00000000 --- a/macros/ChangeLog +++ /dev/null @@ -1,101 +0,0 @@ -Wed Mar 4 01:02:55 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for argp code, - strndup, program_invocation_name, program_invocation_short_name. - -Mon Mar 2 15:27:44 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-x-checks.m4 (GNOME_X_CHECKS): Also check for SMlib.h; some - Solaris systems have -lSM but not SMlib.h. - -Sun Mar 1 17:49:42 1998 Tom Tromey <tromey@cygnus.com> - - * gnome.m4 (GNOME_INIT): Changed spacing so --help output looks - right. - -Fri Feb 27 10:05:34 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-objc-checks.m4 (GNOME_CHECK_OBJC): Set OBJECTIVE_C shell - variable. - -1998-02-26 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-x-checks.m4 (CPPFLAGS): Put $X_CFLAGS here, not in - $CFLAGS. - (GNOME_HAVE_SM): New var. `true' if we have libSM, `false' - otherwise. - -1998-02-19 Raja R Harinath <harinath@cs.umn.edu> - - * gnome.m4: Remove `GNOME_CHECK_GNOME'. - -1998-02-18 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Replace `strcasecmp' if - necessary. - -1998-02-15 Raja R Harinath <harinath@cs.umn.edu> - - * Makefile.am (MACROS): Add `gnome-pthread-check.m4'. - * gnome-pthread-check.m4: New file. Moved pthread check from - gnome-x-checks.m4 to here. - * gnome-objc-checks.m4: Use `gnome-pthread-check'. - (OBJC_LIBS): New config var. - * gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is - already part of `$x_libs'. - Move pthread check to new file. - -Sat Feb 14 12:45:35 1998 Tom Tromey <tromey@cygnus.com> - - * Makefile.am (macros.dep): Use single quotes, not double quotes. - Otherwise bash will interpret `$(...)' incorrectly. - (EXTRA_DIST): Include macros.dep in distribution. - -1998-02-14 Raja R Harinath <harinath@cs.umn.edu> - - * Makefile.am (macros.dep): Put back doubled `$'. We want the - expansion to occur in the including Makefile, not here. - Otherwise, there will be an extra `../' in the rule. - -Sat Feb 14 17:41:28 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr> - - * autogen.sh: multilple aclocal -I directories. - -Sat Feb 14 01:09:37 1998 Tom Tromey <tromey@cygnus.com> - - * Makefile.am (macros.dep): Removed extra `$' from rule. - - * gnome-x-checks.m4: Only check for -lSM if not already in - x_libs. - -1998-02-13 Raja R Harinath <harinath@cs.umn.edu> - - * Makefile.am (EXTRA_DIST): Add `autogen.sh'. - - * gnome-objc-checks.m4 (GNOME_INIT_OBJC): Solaris /bin/sh doesn't - understand `test -e'. - - * autogen.sh: New file. - - * gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where - the installation actually installs it. - - * Makefile.am (macros.dep): New maintainer rule for handling - automatic rebuilding of aclocal.m4 if any of the macros change. - (MACROS): New variable. List of all `m4' macros in this - directory. - -1998-02-12 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-support.m4: New file. Defines GNOME_SUPPORT_CHECKS for - libsupport.a support. - -1998-02-10 Raja R Harinath <harinath@cs.umn.edu> - - * gnome.m4: New file. Moved AC_CHECK_GNOME from `configure.in' to - here, and renamed macro to GNOME_CHECK_GNOME. - * gnome-x-checks.m4: Likewise, move and renaming AC_GNOME_X_CHECKS - to GNOME_X_CHECKS. - - * aclocal-include.m4: New file. Defines AM_ACLOCAL_INCLUDE macro - to provide extra search directories to `aclocal'. diff --git a/macros/Makefile.am b/macros/Makefile.am deleted file mode 100644 index 0ea65e48..00000000 --- a/macros/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Please update this variable if any new macros are created -MACROS= aclocal-include.m4 gnome-guile-checks.m4 \ - gnome-objc-checks.m4 gnome-x-checks.m4 \ - gnome-support.m4 gnome-pthread-check.m4 gnome.m4 - -EXTRA_DIST=$(MACROS) autogen.sh macros.dep -MAINTAINERCLEANFILES=macros.dep - -@MAINT@macros.dep: Makefile.am -@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@ diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4 deleted file mode 100644 index c58c767d..00000000 --- a/macros/aclocal-include.m4 +++ /dev/null @@ -1,10 +0,0 @@ -# aclocal-include.m4 -# -# This macro adds the name macrodir to the set of directories -# that `aclocal' searches for macros. - -# serial 1 - -dnl AM_ACLOCAL_INCLUDE(macrodir) -AC_DEFUN([AM_ACLOCAL_INCLUDE], -[ACLOCAL="$ACLOCAL -I $1"]) diff --git a/macros/autogen.sh b/macros/autogen.sh deleted file mode 100644 index 31624d6b..00000000 --- a/macros/autogen.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/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/lib/libgtk.so \ - || test -f /opt/gnome/lib/libgtk.a \ - || test -f /opt/gnome/lib/libgtk.so \ - || test -f /usr/lib/libgtk.a \ - || test -f /usr/lib/libgtk.so \ - || test -f /usr/local/lib/libgtk.a \ - || test -f /usr/local/lib/libgtk.so \ - || 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 - -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 j in `find $srcdir -name configure.in -print` -do - i=`dirname $j` - macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $j` - echo processing $i - ## debug - test -n "$macrodirs" && echo \`aclocal\' will also look in \`$macrodirs\' - (cd $i; \ - aclocalinclude=""; \ - for k in $macrodirs; do \ - if test -d $k; then aclocalinclude="$aclocalinclude -I $k"; \ - else echo "**Warning**: No such directory \`$k'. Ignored."; fi; \ - done; \ - libtoolize --copy --force; \ - aclocal $aclocalinclude; \ - autoheader; automake --add-missing --gnu; autoheader; autoconf) -done - -echo running $srcdir/configure --enable-maintainer-mode "$@" -$srcdir/configure --enable-maintainer-mode "$@" \ -&& echo Now type \`make\' to compile the $PKG_NAME diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4 deleted file mode 100644 index df1e9f06..00000000 --- a/macros/gnome-guile-checks.m4 +++ /dev/null @@ -1,23 +0,0 @@ -AC_DEFUN([GNOME_CHECK_GUILE], -[ - AC_CHECK_LIB(qthreads,main,[ - QTTHREADS_LIB="-lqthreads" - AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap") - AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline") - ],[ - AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt") - ],$LIBS) - AC_SUBST(TERMCAP_LIB) - AC_SUBST(READLINE_LIB) - AC_SUBST(QTTHREADS_LIB) - - AC_CHECK_LIB(guile, scm_boot_guile,[ - GUILE_LIBS="-lguile" - ac_cv_guile_found=yes - ],[ - AC_MSG_WARN(Can not find Guile 1.2 on the system) - ac_cv_guile_found=no - ], $QTTHREADS_LIB $LIBS) - AC_SUBST(GUILE_LIBS) - AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes) -]) diff --git a/macros/gnome-objc-checks.m4 b/macros/gnome-objc-checks.m4 deleted file mode 100644 index 074b9348..00000000 --- a/macros/gnome-objc-checks.m4 +++ /dev/null @@ -1,64 +0,0 @@ -AC_DEFUN([GNOME_CHECK_OBJC], -[ -dnl Look for an ObjC compiler. -dnl FIXME: extend list of possible names of ObjC compilers. - AC_CHECK_PROGS(OBJC, $OBJC gcc, "") - - AC_REQUIRE([GNOME_PTHREAD_CHECK]) - - OBJC_LIBS="-lobjc $PTHREAD_LIB" - AC_CHECK_FUNC(sched_yield,,[ - AC_CHECK_LIB(posix4,sched_yield, - OBJC_LIBS="$OBJC_LIBS -lposix4",, $OBJC_LIBS)]) - AC_SUBST(OBJC_LIBS) - - AC_CACHE_CHECK([if Objective C compiler ($OBJC) works], - ac_cv_prog_objc_works, [ - if test -n "$OBJC"; then - cat > conftest.m <<EOF -#include <objc/Object.h> -@interface myRandomObj : Object -{ -} -@end -@implementation myRandomObj -@end -int main () { - /* No, you are not seeing double. Remember that square brackets - are the autoconf m4 quotes. */ - id myid = [[myRandomObj alloc]]; - [[myid free]]; - return 0; -} -EOF - - $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&AC_FD_CC 2>&1 - result=$? - rm -f conftest* - - if test $result -eq 0; then - ac_cv_prog_objc_works=yes - fi - else - ac_cv_prog_objc_works=no - fi - ]) - - AM_CONDITIONAL(OBJECTIVE_C, test x$ac_cv_prog_objc_works = xyes) - dnl Also set the shell variable OBJECTIVE_C to "yes" or "no". - OBJECTIVE_C=$ac_cv_prog_objc_works -]) - -AC_DEFUN([GNOME_INIT_OBJC], -[ - AC_MSG_CHECKING(for obGnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/obGnomeConf.sh; then - . $gnome_prefix/obGnomeConf.sh - AC_MSG_RESULT(found) - else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Could not find the obGnomeConf.sh file that is generated by gnome-objc install) - fi - AC_SUBST(OBGNOME_LIBS) - AC_SUBST(OBGTK_LIBS) -]) diff --git a/macros/gnome-pthread-check.m4 b/macros/gnome-pthread-check.m4 deleted file mode 100644 index d7fec3fb..00000000 --- a/macros/gnome-pthread-check.m4 +++ /dev/null @@ -1,7 +0,0 @@ -AC_DEFUN([GNOME_PTHREAD_CHECK],[ - PTHREAD_LIB="" - AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", - [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r")]) - AC_SUBST(PTHREAD_LIB) - AC_PROVIDE([GNOME_PTHREAD_CHECK]) -]) diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4 deleted file mode 100644 index 381bc98c..00000000 --- a/macros/gnome-support.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl libsupport stuff -dnl GNOME_SUPPORT_CHECKS -AC_DEFUN([GNOME_SUPPORT_CHECKS],[ - AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") - AC_CHECK_FUNCS(argp_parse,,LIBOBJS="$LIBOBJS argp-ba.o argp-eexst.o argp-fmtstream.o argp-fs-xinl.o argp-help.o argp-parse.o argp-pv.o argp-xinl.o") - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_short_name], [ - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME)]) - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_name], [ - AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)]) - AC_REPLACE_FUNCS(strtok_r strcasecmp strndup) - AC_SUBST(LIBOBJS) -]) diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 deleted file mode 100644 index d5df4ea3..00000000 --- a/macros/gnome-x-checks.m4 +++ /dev/null @@ -1,90 +0,0 @@ -dnl GNOME_X_CHECKS -dnl -dnl Basic X11 related checks for X11. At the end, the following will be -dnl defined/changed: -dnl x_{includes,libraries} From AC_PATH_X -dnl X_{CFLAGS,LIBS} From AC_PATH_XTRA -dnl X_{PRE,EXTRA}_LIBS - do - -dnl x_libs Essentially $X_PRE_LIBS -lX11 -Xext $X_EXTRA_LIBS -dnl CPPFLAGS Will include $X_CFLAGS -dnl GNOME_HAVE_SM `true' or `false' depending on whether session -dnl management is available. It is available if -dnl both -lSM and X11/SM/SMlib.h exist. (Some -dnl Solaris boxes have the library but not the header) -dnl -dnl The following configure cache variables are defined (but not used): -dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} -dnl -AC_DEFUN([GNOME_X_CHECKS], -[ - AC_PATH_X - AC_PATH_XTRA - - saved_ldflags="$LDFLAGS" - LDFLAGS="$X_LDFLAGS $X_LIBS" - - dnl Hope that X_CFLAGS have only -I and -D. Otherwise, we could - dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" - dnl - dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses - dnl CPPFLAGS, not CFLAGS - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - dnl Checks for libraries. - AC_CHECK_LIB(X11, XOpenDisplay, - x_libs="$X_PRE_LIBS -lX11", - [AC_MSG_ERROR(No X11 installed)], - $X_EXTRA_LIBS) - AC_SUBST(x_libs) - - LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS $x_libs" - - AC_CHECK_LIB(Xext, XShmAttach, - x_libs="$x_libs -lXext", , - $x_libs $X_EXTRA_LIBS) - - x_libs="$x_libs $X_EXTRA_LIBS" - gnome_cv_passdown_x_libs="$x_libs" - gnome_cv_passdown_X_LIBS="$X_LIBS" - gnome_cv_passdown_X_CFLAGS="$X_CFLAGS" - - LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS" - - GNOME_HAVE_SM=true - case "$x_libs" in - *-lSM*) - dnl Already found it. - ;; - *) - dnl Assume that if we have -lSM then we also have -lICE. - AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [x_libs="$x_libs -lSM -lICE"],GNOME_HAVE_SM=false, - $x_libs -lICE) - ;; - esac - - if test "$GNOME_HAVE_SM" = true; then - AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) - fi - - if test "$GNOME_HAVE_SM" = true; then - AC_DEFINE(HAVE_LIBSM) - fi - - AC_CHECK_LIB(gtk, gdk_pixmap_unref, - GTK_LIBS="-lgtk -lgdk -lglib -lm", - [AC_MSG_ERROR(Can not find a Gtk 0.99.1, probably you have an older version?)], - -lgdk -lglib $x_libs -lm) - AC_SUBST(GTK_LIBS) - - gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" - - XPM_LIBS="" - AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) - AC_SUBST(XPM_LIBS) - - AC_REQUIRE([GNOME_PTHREAD_CHECK]) - LDFLAGS="$saved_ldflags" - - AC_PROVIDE([GNOME_X_CHECKS]) -]) diff --git a/macros/gnome.m4 b/macros/gnome.m4 deleted file mode 100644 index 5e456782..00000000 --- a/macros/gnome.m4 +++ /dev/null @@ -1,47 +0,0 @@ -AC_DEFUN([GNOME_INIT], -[ - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_LIBS) - AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(GNOME_LIBDIR) - AC_SUBST(GNOME_INCLUDEDIR) - - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - AC_ARG_WITH(gnome-includes, - [ --with-gnome-includes Specify location of GNOME headers],[ - CFLAGS="$CFLAGS -I$withval" - ]) - - AC_ARG_WITH(gnome-libs, - [ --with-gnome-libs Specify location of GNOME libs],[ - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - ]) - - AC_ARG_WITH(gnome, - [ --with-gnome Specify prefix for GNOME files],[ - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - ]) - - - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/gnomeConf.sh; then - AC_MSG_RESULT(found) - echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi -]) |