diff options
| -rw-r--r-- | macros/.cvsignore | 4 | ||||
| -rw-r--r-- | macros/ChangeLog | 176 | ||||
| -rw-r--r-- | macros/Makefile.am | 10 | ||||
| -rw-r--r-- | macros/aclocal-include.m4 | 10 | ||||
| -rw-r--r-- | macros/autogen.sh | 93 | ||||
| -rw-r--r-- | macros/gnome-guile-checks.m4 | 23 | ||||
| -rw-r--r-- | macros/gnome-objc-checks.m4 | 65 | ||||
| -rw-r--r-- | macros/gnome-pthread-check.m4 | 7 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 74 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 67 | ||||
| -rw-r--r-- | macros/gnome.m4 | 65 |
11 files changed, 0 insertions, 594 deletions
diff --git a/macros/.cvsignore b/macros/.cvsignore deleted file mode 100644 index 1a58525e64..0000000000 --- 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 7b710b6f51..0000000000 --- a/macros/ChangeLog +++ /dev/null @@ -1,176 +0,0 @@ -Fri Apr 24 16:43:38 1998 Owen Taylor <otaylor@gtk.org> - - * autogen.sh: Pass the results of the environment variable - ACLOCAL_FLAGS to aclocal. This allows, for instance, - - ACLOCAL_FLAGS="-I /home/owen/share/aclocal/" autogen.sh - -Sun Apr 19 01:35:53 EDT 1998 Gregory McLean <gregm@comstar.net> - - * gnome-x-checks.m4: Updated the gtk check to check for 1.0.0 - - -1998-04-08 Raja R Harinath <harinath@cs.umn.edu> - - * autogen.sh: Update to list newer versions of packages. - * gnome-support.m4: Add `scandir' to AC_REPLACE_FUNCS. - Also run AC_HEADER_DIRENT. - -1998-03-31 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-support.m4 (AC_REPLACE_FUNCS): Look for vasprintf. - -Thu Mar 19 23:23:30 1998 Tom Tromey <tromey@cygnus.com> - - * gnome.m4: An empty true branch of an `if' statement is not valid - sh syntax. If GNOME_INIT_HOOK argument $1 is empty, use ":" - instead. - -1998-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx> - - * gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to - execute; Accept a probe mode. - - (GNOME_INIT): Define in terms of GNOME_INIT_HOOK. - -Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-support.m4: Cache results of check for - program_invocation_short_name, program_invocation_name. Check to - make sure argp functions are in a library. - - * gnome-support.m4: Cache results of argp check. - -Sun Mar 15 15:54:43 1998 Owen Taylor <owt1@cornell.edu> - - * gnome-x-checks.m4: Replaced checks for X and GTK - with AM_PATH_GTK. x_include, X_LIBS, etc, variables no longer - defined. - -1998-03-12 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-support.m4: Add a check for <linewrap.h> -- this enables - some optimizations when compiling `argp'. - -Mon Mar 9 19:32:42 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-support.m4: Build vsnprintf.o, not vsnprint.o. - -1998-03-09 Raja R Harinath <harinath@cs.umn.edu> - - * gnome-support.m4: Add check for `vsnprintf'. - -Sun Mar 8 17:04:28 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-support.m4: Set need_gnome_support shell variable. Define - BUILD_GNOME_SUPPORT automake conditional. Define LTLIBOBJS. Look - for argp_domain element in struct argp. - -Sat Mar 7 00:04:22 1998 Tom Tromey <tromey@cygnus.com> - - * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Add argp-pvh.o to - LIBOBJS. - - * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for strnlen(). - -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 0ea65e484e..0000000000 --- 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 c58c767db4..0000000000 --- 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 a1530b20d6..0000000000 --- a/macros/autogen.sh +++ /dev/null @@ -1,93 +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://ftp.gnu.org/pub/gnu/libtool-1.2.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.gnu.org/pub/gnu/automake-1.3.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.gnu.org/pub/gnu/automake-1.3.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` - if test -f $i/NO-AUTO-GEN; then - echo skipping $i -- flagged as no auto-gen - else - 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="$ACLOCAL_FLAGS"; \ - 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) - fi -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 df1e9f0665..0000000000 --- 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 3691bc5dc0..0000000000 --- a/macros/gnome-objc-checks.m4 +++ /dev/null @@ -1,65 +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_INCLUDEDIR) - 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 d7fec3fb41..0000000000 --- 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 afead5f833..0000000000 --- a/macros/gnome-support.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl GNOME_SUPPORT_CHECKS -dnl Check for various support functions needed by the standard -dnl Gnome libraries. Sets LIBOBJS, might define some macros, -dnl and will set the need_gnome_support shell variable to "yes" -dnl or "no". Also sets up the Automake BUILD_GNOME_SUPPORT -dnl conditional. This should only be used when building the Gnome -dnl libs; Gnome clients should not need this macro. -AC_DEFUN([GNOME_SUPPORT_CHECKS],[ - need_gnome_support=no - save_LIBOBJS="$LIBOBJS" - LIBOBJS= - - AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") - - # We check for argp_domain because we use it, and it appears only in - # very recent versions of the argp library. - AC_CACHE_CHECK([for working argp code], gnome_cv_argp, [ - AC_TRY_COMPILE([#include <argp.h>], [ - struct argp foo; - extern char *foo2; - foo.argp_domain = foo2;], - gnome_cv_argp=yes, - gnome_cv_argp=no) - - # It is possible to have the argp headers installed but not have - # the code in the C library. At least, there have been reports of - # this happening. So we check for this case explicitly. - if test "$gnome_cv_argp" = yes; then - AC_CHECK_FUNC(argp_parse,,gnome_cv_argp=no) - fi]) - - if test "$gnome_cv_argp" = no; then - 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-pvh.o argp-xinl.o" - fi - - # This header enables some optimizations inside argp. - AC_CHECK_HEADERS(linewrap.h) - # for `scandir' - AC_HEADER_DIRENT - - AC_CACHE_CHECK([for program_invocation_short_name], gnome_cv_short_name, [ - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_short_name], - gnome_cv_short_name=yes, gnome_cv_short_name=no)]) - if test "$gnome_cv_short_name" = yes; then - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME) - fi - - AC_CACHE_CHECK([for program_invocation_name], gnome_cv_invocation_name, [ - AC_TRY_LINK([#include <errno.h>],[ - char *foo = program_invocation_name], - gnome_cv_invocation_name=yes, gnome_cv_invocation_name=no)]) - if test "$gnome_cv_invocation_name" = yes; then - AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME) - fi - - AC_CHECK_FUNCS(vsnprintf,,[ - AC_CHECK_FUNCS(__vsnprintf, - LIBOBJS="$LIBOBJS easy-vsnprintf.o", - LIBOBJS="$LIBOBJS vsnprintf.o")]) - - AC_REPLACE_FUNCS(scandir strtok_r strcasecmp strndup strnlen vasprintf) - - if test "$LIBOBJS" != ""; then - need_gnome_support=yes - fi - # Turn our LIBOBJS into libtool objects. This is gross, but it - # requires changes to autoconf before it goes away. - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` - AC_SUBST(LTLIBOBJS) - - LIBOBJS="$save_LIBOBJS" - AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes) -]) diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 deleted file mode 100644 index 7b43a5744d..0000000000 --- a/macros/gnome-x-checks.m4 +++ /dev/null @@ -1,67 +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 GTK_{CFLAGS,LIBS} From AM_PATH_GTK -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 XPM_LIBS -lXpm if Xpm library is present, otherwise "" -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], -[ - AM_PATH_GTK(1.0.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) - - dnl Hope that GTK_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 $GTK_CFLAGS" - - saved_ldflags="$LDFLAGS" - LDFLAGS="$LDFLAGS $GTK_LIBS" - - gnome_cv_passdown_x_libs="$GTK_LIBS" - gnome_cv_passdown_X_LIBS="$GTK_LIBS" - gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS" - gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" - - LDFLAGS="$saved_ldflags $GTK_LIBS" - - GNOME_HAVE_SM=true - case "$GTK_LIBS" in - *-lSM*) - dnl Already found it. - ;; - *) - dnl Assume that if we have -lSM then we also have -lICE. - AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [GTK_LIBS="-lSM -lICE $GTK_LIBS"],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 - - - 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 aa6165fad4..0000000000 --- a/macros/gnome.m4 +++ /dev/null @@ -1,65 +0,0 @@ -dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag) -dnl -dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh -dnl is not found. -dnl - -AC_DEFUN([GNOME_INIT_HOOK], -[ - 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],[ - if test x$withval = xyes; then - dnl Note that an empty true branch is not valid sh syntax. - ifelse([$1], [], :, [$1]) - else - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - ]) - - 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 - $1 - else - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi - fi -]) - -AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail) -]) |