diff options
Diffstat (limited to 'macros2')
| -rw-r--r-- | macros2/.cvsignore | 4 | ||||
| -rw-r--r-- | macros2/ChangeLog | 92 | ||||
| -rw-r--r-- | macros2/Makefile.am | 22 | ||||
| -rw-r--r-- | macros2/autogen.sh | 148 | ||||
| -rw-r--r-- | macros2/check-utmp.m4 | 243 | ||||
| -rw-r--r-- | macros2/compiler-flags.m4 | 143 | ||||
| -rw-r--r-- | macros2/gnome-common.m4 | 51 | ||||
| -rw-r--r-- | macros2/gnome-cxx-check.m4 | 10 | ||||
| -rw-r--r-- | macros2/gnome-gettext.m4 | 336 | ||||
| -rw-r--r-- | macros2/gnome-pkgconfig.m4 | 187 | ||||
| -rw-r--r-- | macros2/gnome-platform.m4 | 36 | ||||
| -rw-r--r-- | macros2/gnome-pthread-check.m4 | 16 | ||||
| -rw-r--r-- | macros2/gnome-x-checks.m4 | 53 | ||||
| -rw-r--r-- | macros2/linger.m4 | 28 |
14 files changed, 0 insertions, 1369 deletions
diff --git a/macros2/.cvsignore b/macros2/.cvsignore deleted file mode 100644 index 347fe394..00000000 --- a/macros2/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -macros.dep -gnome2-macros.dep diff --git a/macros2/ChangeLog b/macros2/ChangeLog deleted file mode 100644 index 91fc6186..00000000 --- a/macros2/ChangeLog +++ /dev/null @@ -1,92 +0,0 @@ -2000-12-01 Martin Baulig <baulig@suse.de> - - * compile-warnings.m4: Improved compile warnings check; the - --enable-compile-warnings parameter now takes 5 different - values (no/minimum/yes/maximum/error). AC_SUBST(WARN_CFLAGS). - -2000-11-29 Martin Baulig <baulig@suse.de> - - * gnome.m4, gnome-gnorba-check.m4, gnome-fileutils.m4: Removed. - -2000-11-26 Martin Baulig <martin@home-of-linux.org> - - * gnome-x-checks.m4 (GNOME2_X_CHECKS): Use - GNOME_PKGCONFIG_CHECK_MODULES. - - * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Don't - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]). - (GNOME_CHECK_PKGCONFIG): Check for pkg-config >= 0.4.1. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-pkgconfig.m4: Added GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES - to check for a list of optional modules. - - * gnome-platform.m4: Require GNOME_REQUIRE_PKGCONFIG. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-platform.m4: New file. This defines - GNOME_PLATFORM_GNOME_2. - - * gnome-pkgconfig.m4: Disable the --extra-flags argument to - pkg-config, this doesn't exist anymore. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-pkgconfig.m4: New file. This defines - GNOME_CHECK_PKGCONFIG, GNOME_REQUIRE_PKGCONFIG and - GNOME_PKGCONFIG_* macros from pkg-config. - -2000-11-21 Martin Baulig <baulig@suse.de> - - * gnome-support.m4, need-declaration.m4: Removed. - -2000-09-30 Martin Baulig <baulig@suse.de> - - * gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0; - Removed all `gnome_cv_passdown_x_*' variables and `USE_DEVGTK'. - - * gnome-common.m4 (GNOME_COMMON_INIT): Added the always-false - INSIDE_GNOME_COMMON automake conditional. - (GNOME_GTKDOC_CHECK): New macro. - (GNOME_DEBUG_CHECK): New macro. - -Thu Aug 24 02:28:57 2000 George Lebl <jirka@5z.com> - - * gnome-x-checks.m4: use the correct name in AC_PROVIDE - -2000-08-06 Martin Baulig <baulig@suse.de> - - * gnome-x-checks.m4 (GNOME_X_CHECKS): Renamed - to GNOME2_X_CHECKS. - -2000-07-24 Martin Baulig <martin@home-of-linux.org> - - * autogen.sh: Removed some old crap in it. - * aclocal-include.m4: Removed. - - * gnome-x-checks.m4: Check for GTK+ 2.0. - -2000-07-24 Martin Baulig <baulig@suse.de> - - * autogen.sh: Make it work with AM_GNOME2_GETTEXT. - * check-utmp.m4: New file. - -2000-07-24 Martin Baulig <baulig@suse.de> - - Synced with gnome-libs/gnome-data. - -2000-06-09 Martin Baulig <martin@home-of-linux.org> - - * gnome-common.m4: We need this here as well. - -2000-05-29 Martin Baulig <baulig@suse.de> - - * Makefile.am: New file. Install this stuff into - `$(datadir)/aclocal/gnome2-macros'. - - * gnome.m4: New file. Copied from `hack-macros' dir. - - * autogen.sh: New file. Copied from `macros' dir. - diff --git a/macros2/Makefile.am b/macros2/Makefile.am deleted file mode 100644 index f645f4f3..00000000 --- a/macros2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Please update this variable if any new macros are created - -GNOME2_MACROS= \ - compiler-flags.m4 gnome-common.m4 gnome-cxx-check.m4 \ - gnome-gettext.m4 gnome-pthread-check.m4 gnome-x-checks.m4 \ - linger.m4 check-utmp.m4 gnome-pkgconfig.m4 gnome-platform.m4 - -EXTRA_DIST=$(GNOME2_MACROS) autogen.sh -MAINTAINERCLEANFILES=macros2.dep - -@MAINT@macros2.dep: Makefile.am -@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=macros2/%)' > $@ - -if INSIDE_GNOME_COMMON -gnome2_aclocaldir = $(datadir)/aclocal/gnome2-macros - -gnome2-macros.dep: Makefile.am - @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=$(gnome2_aclocaldir)/%)' > $@ - -gnome2_aclocal_DATA = $(GNOME2_MACROS) autogen.sh gnome2-macros.dep - -endif diff --git a/macros2/autogen.sh b/macros2/autogen.sh deleted file mode 100644 index c10d02a5..00000000 --- a/macros2/autogen.sh +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -DIE=0 - -if [ -n "$GNOME2_DIR" ]; then - ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" - LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" - PATH="$GNOME2_DIR/bin:$PATH" - export PATH - export LD_LIBRARY_PATH -fi - -(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 -} - -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (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.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed to compile Gnome." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -grep "^AM_GNOME2?_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed to compile Gnome." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.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 - -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 - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - ( cd $dr - - aclocalinclude="$ACLOCAL_FLAGS" - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then - if grep "sed.*POTFILES" configure.in >/dev/null; then - : do nothing -- we still have an old unmodified configure.in - else - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - fi - if grep "^AM_GNOME2_GETTEXT" configure.in >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/macros2/check-utmp.m4 b/macros2/check-utmp.m4 deleted file mode 100644 index 5241b96b..00000000 --- a/macros2/check-utmp.m4 +++ /dev/null @@ -1,243 +0,0 @@ -# Checks for availability of various utmp fields -# -# Original code by Bernhard Rosenkraenzer (bero@linux.net.eu.org), 1998. -# Modifications by Timur Bakeyev (timur@gnu.org), 1999. -# - -dnl AC_CHECK_UTMP() -dnl Test for presence of the field and define HAVE_UT_UT_field macro -dnl - -AC_DEFUN(AC_CHECK_UTMP,[ - -AC_CHECK_HEADERS(sys/time.h utmp.h utmpx.h) -AC_HEADER_TIME - -if test "$ac_cv_header_utmpx_h" = "yes"; then - AC_DEFINE(UTMP,[struct utmpx]) -else - AC_DEFINE(UTMP,[struct utmp]) -fi - -dnl some systems (BSD4.4-like) require time.h to be included before utmp.h :/ -AC_MSG_CHECKING(for ut_host field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; char *p; p=ut.ut_host;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_HOST) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_pid field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; int i; i=ut.ut_pid;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_PID) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_id field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; char *p; p=ut.ut_id;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_ID) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_name field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; char *p; p=ut.ut_name;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_NAME) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_type field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; int i; i=(int) ut.ut_type;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TYPE) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_exit.e_termination field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; ut.ut_exit.e_termination=0;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_EXIT_E_TERMINATION) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_user field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; char *p; p=ut.ut_user;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_USER) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_time field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; ut.ut_time=0;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TIME) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_tv field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; ut.ut_tv={0, 0};],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TV) -fi -AC_MSG_RESULT($result) - -AC_MSG_CHECKING(for ut_syslen field in the utmp structure) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#ifdef HAVE_UTMP_H -#include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -#include <utmpx.h> -#endif],[UTMP ut; ut.ut_syslen=0;],result=yes,result=no) -if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_SYSLEN) -fi -AC_MSG_RESULT($result) - -]) diff --git a/macros2/compiler-flags.m4 b/macros2/compiler-flags.m4 deleted file mode 100644 index 72947849..00000000 --- a/macros2/compiler-flags.m4 +++ /dev/null @@ -1,143 +0,0 @@ -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - if test -z "$1" ; then - default_compile_warnings=no - else - default_compile_warnings="$1" - fi - - AC_ARG_ENABLE(compile-warnings, - [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="$default_compile_warnings"]) - - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall -Wunused" - ;; - yes) - warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" - ;; - maximum|error) - warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wsign-promo -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) - - AC_ARG_ENABLE(iso-c, - [ --enable-iso-c Try to warn if code is not ISO C ],, - enable_iso_c=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - [ --enable-iso-cxx Try to warn if code is not ISO C++ ],, - enable_iso_cxx=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - if test "x$cxxflags_set" != "xyes"; then - CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - cxxflags_set=yes - AC_SUBST(cxxflags_set) - fi -]) diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4 deleted file mode 100644 index d229843a..00000000 --- a/macros2/gnome-common.m4 +++ /dev/null @@ -1,51 +0,0 @@ -# gnome-common.m4 -# - -dnl GNOME_COMMON_INIT - -AC_DEFUN([GNOME_COMMON_INIT], -[ - AC_CACHE_VAL(ac_cv_gnome_aclocal_dir, - [ac_cv_gnome_aclocal_dir="$GNOME_COMMON_MACROS_DIR"]) - AC_CACHE_VAL(ac_cv_gnome_aclocal_flags, - [ac_cv_gnome_aclocal_flags="$ACLOCAL_FLAGS"]) - GNOME_ACLOCAL_DIR="$ac_cv_gnome_aclocal_dir" - GNOME_ACLOCAL_FLAGS="$ac_cv_gnome_aclocal_flags" - AC_SUBST(GNOME_ACLOCAL_DIR) - AC_SUBST(GNOME_ACLOCAL_FLAGS) - - ACLOCAL="$ACLOCAL $GNOME_ACLOCAL_FLAGS" - - AM_CONDITIONAL(INSIDE_GNOME_DOCU, false) -]) - -AC_DEFUN([GNOME_GTKDOC_CHECK], -[ - AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) - AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) - AC_SUBST(HAVE_GTK_DOC) - - dnl Let people disable the gtk-doc stuff. - AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) - - if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi - fi - - dnl NOTE: We need to use a separate automake conditional for this - dnl to make this work with the tarballs. - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -]) - -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) - - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG) - fi -]) diff --git a/macros2/gnome-cxx-check.m4 b/macros2/gnome-cxx-check.m4 deleted file mode 100644 index 786138c5..00000000 --- a/macros2/gnome-cxx-check.m4 +++ /dev/null @@ -1,10 +0,0 @@ -dnl GNOME_CHECK_CXX(not_found_string) -AC_DEFUN(GNOME_CHECK_CXX, -[ - # see if a C++ compiler exists and works - AC_REQUIRE([AC_PROG_CXX])dnl - if test "x$ac_cv_prog_cxx_works" = xno; then - AC_MSG_WARN(ifelse([$1], , "No C++ compiler", [$1])) - fi - AM_CONDITIONAL(CXX_PRESENT, test "x$ac_cv_prog_cxx_works" != xno) -]) diff --git a/macros2/gnome-gettext.m4 b/macros2/gnome-gettext.m4 deleted file mode 100644 index 46f2f621..00000000 --- a/macros2/gnome-gettext.m4 +++ /dev/null @@ -1,336 +0,0 @@ -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995. -# -# Modified to never use included libintl. -# Owen Taylor <otaylor@redhat.com>, 12/15/1998 -# -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 5 - -AC_DEFUN(MY_AM_GNOME_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - USE_INCLUDED_LIBINTL=no - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) -# AC_MSG_CHECKING([whether included gettext is requested]) -# AC_ARG_WITH(included-gettext, -# [ --with-included-gettext use the GNU gettext library included here], -# nls_cv_force_use_gnu_gettext=$withval, -# nls_cv_force_use_gnu_gettext=no) -# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - nls_cv_force_use_gnu_gettext="no" - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)], - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - - # Added by Martin Baulig 12/15/98 for libc5 systems - if test "$gt_cv_func_gettext_libc" != "yes" \ - && test "$gt_cv_func_gettext_libintl" = "yes"; then - INTLLIBS=-lintl - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl -# if test "$GENCAT" != "no"; then -# AC_PATH_PROG(GMSGFMT, gmsgfmt, no) -# if test "$GMSGFMT" = "no"; then -# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, -# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) -# fi -# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -# USE_INCLUDED_LIBINTL=yes -# CATOBJEXT=.cat -# INSTOBJEXT=.cat -# DATADIRNAME=lib -# INTLDEPS='$(top_builddir)/intl/libintl.a' -# INTLLIBS=$INTLDEPS -# LIBS=`echo $LIBS | sed -e 's/-lintl//'` -# nls_cv_header_intl=intl/libintl.h -# nls_cv_header_libgt=intl/libgettext.h -# fi - ]) - fi - fi - - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" != "yes"; then - AC_DEFINE(ENABLE_NLS) - else - # Unset this variable since we use the non-zero value as a flag. - CATOBJEXT= -# dnl Mark actions used to generate GNU NLS library. -# INTLOBJS="\$(GETTOBJS)" -# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) -# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -# AC_SUBST(MSGFMT) -# USE_INCLUDED_LIBINTL=yes -# CATOBJEXT=.gmo -# INSTOBJEXT=.mo -# DATADIRNAME=share -# INTLDEPS='$(top_builddir)/intl/libintl.a' -# INTLLIBS=$INTLDEPS -# LIBS=`echo $LIBS | sed -e 's/-lintl//'` -# nls_cv_header_intl=intl/libintl.h -# nls_cv_header_libgt=intl/libgettext.h - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - -# # If this is used in GNU gettext we have to set USE_NLS to `yes' -# # because some of the sources are only built for this goal. -# if test "$PACKAGE" = gettext; then -# USE_NLS=yes -# USE_INCLUDED_LIBINTL=yes -# fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -AC_DEFUN(AM_GNOME2_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi - - AM_LC_MESSAGES - MY_AM_GNOME_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - if test "x$LINGUAS" = "x"; then - LINGUAS=$ALL_LINGUAS - fi - for lang in $LINGUAS; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl The reference to <locale.h> in the installed <libintl.h> file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include <locale.h>" - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header <locale.h>. Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - diff --git a/macros2/gnome-pkgconfig.m4 b/macros2/gnome-pkgconfig.m4 deleted file mode 100644 index 628cdcec..00000000 --- a/macros2/gnome-pkgconfig.m4 +++ /dev/null @@ -1,187 +0,0 @@ -dnl GNOME_PKGCONFIG_CHECK_VERSION() extracts up to 6 decimal numbers out of given-version -dnl and required-version, using any non-number letters as delimiters. it then -dnl compares each of those 6 numbers in order 1..6 to each other, requirering -dnl all of the 6 given-version numbers to be greater than, or at least equal -dnl to the corresponding number of required-version. -dnl GNOME_PKGCONFIG_CHECK_VERSION(given-version, required-version [, match-action] [, else-action]) -AC_DEFUN([GNOME_PKGCONFIG_CHECK_VERSION],[ -[eval `echo "$1:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ - -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_v1=\1 ac_v2=\2 ac_v3=\3 ac_v4=\4 ac_v5=\5 ac_v6=\6/' \ -`] -[eval `echo "$2:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ - -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_r1=\1 ac_r2=\2 ac_r3=\3 ac_r4=\4 ac_r5=\5 ac_r6=\6/' \ -`] -ac_vm=[`expr \( $ac_v1 \> $ac_r1 \) \| \( \( $ac_v1 \= $ac_r1 \) \& \( \ - \( $ac_v2 \> $ac_r2 \) \| \( \( $ac_v2 \= $ac_r2 \) \& \( \ - \( $ac_v3 \> $ac_r3 \) \| \( \( $ac_v3 \= $ac_r3 \) \& \( \ - \( $ac_v4 \> $ac_r4 \) \| \( \( $ac_v4 \= $ac_r4 \) \& \( \ - \( $ac_v5 \> $ac_r5 \) \| \( \( $ac_v5 \= $ac_r5 \) \& \( \ - \( $ac_v6 \>= $ac_r6 \) \ - \) \) \ - \) \) \ - \) \) \ - \) \) \ - \) \) `] -case $ac_vm in -[1)] - [$3] - ;; -*[)] - [$4] - ;; -esac -]) - -dnl -dnl GNOME_CHECK_PKGCONFIG (script-if-enabled, [failflag]) -dnl -AC_DEFUN([GNOME_CHECK_PKGCONFIG],[ - AC_PATH_PROG(PKG_CONFIG, pkg-config) - have_pkgconfig=no - if test -x "$PKG_CONFIG" ; then - have_pkgconfig=yes - else - PKG_CONFIG= - fi - AC_MSG_CHECKING(for pkg-config) - if test x$have_pkgconfig = xyes ; then - pkgconfig_required_version=0.4.1 - pkgconfig_version=`pkg-config --version` - GNOME_PKGCONFIG_CHECK_VERSION($pkgconfig_version, $pkgconfig_required_version, [have_pkgconfig=yes], [have_pkgconfig=no]) - fi - if test x$have_pkgconfig = xyes ; then - AC_MSG_RESULT(yes) - else - PKG_CONFIG= - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR([ -*** You need the latest pkg-config (at least $pkgconfig_required_version). -*** Get the latest version of pkg-config from -*** http://pkgconfig.sourceforce.net.]) - fi - fi - AC_SUBST(PKG_CONFIG) - - AC_PROVIDE([GNOME_REQUIRE_PKGCONFIG]) -]) - -dnl -dnl GNOME_REQUIRE_PKGCONFIG -dnl -AC_DEFUN([GNOME_REQUIRE_PKGCONFIG],[ - GNOME_CHECK_PKGCONFIG([], fail) -]) - -dnl Check if the C compiler accepts a certain C flag, and if so adds it to -dnl CFLAGS -AC_DEFUN([GNOME_PKGCONFIG_CHECK_CFLAG], [ - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) - - AC_MSG_CHECKING(if C compiler accepts $1) - save_CFLAGS="$CFLAGS" - - dnl make sure we add it only once - dnl this one doesn't seem to work: *[\ \ ]$1[\ \ ]*) ;; - case " $CFLAGS " in - *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;; - *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;; - *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;; - *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;; - *) CFLAGS="$CFLAGS $1" ;; - esac - - AC_TRY_COMPILE([#include <stdio.h>], [printf("hello");], - [ AC_MSG_RESULT(yes)],dnl - [ CFLAGS="$save_CFLAGS" AC_MSG_RESULT(no) ]) -]) - -dnl add $ACLOCAL_FLAGS (and optionally more dirs) to the aclocal -dnl commandline, so make can work even if it needs to rerun aclocal -AC_DEFUN([GNOME_PKGCONFIG_ACLOCALFLAGS], -[ - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) - - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - - for i in "$1"; do - ACLOCAL="$ACLOCAL -I $i" - done -]) - -AC_DEFUN([GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES], -[ - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) - - name=$1 - depvar=$3 - - AC_MSG_CHECKING(for libraries) - pkg_list="" - for module in $2 ""; do - if test -n "$module"; then - if `echo $module |grep -q ":"`; then - dnl has version requirement - pkg_module_name=`echo $module |sed 's/\(.*\):.*/\1/'` - test_version=`echo $module |sed 's/.*:\(.*\)/\1/'` - - msg=`$PKG_CONFIG $pkg_module_name 2>&1` - if test -z "$msg"; then - dnl module exists - pkg_version=`$PKG_CONFIG --modversion $pkg_module_name` - GNOME_PKGCONFIG_CHECK_VERSION($pkg_version, $test_version, - dnl has the right version - echo $ac_n "$pkg_module_name " - pkg_list="$pkg_list $pkg_module_name" - , - AC_MSG_RESULT([($pkg_module_name)]) - if test x$4 = xfail ; then - AC_MSG_ERROR([An old version of $pkg_module_name (version $pkg_version) was found. You need at least version $test_version]) - else - AC_MSG_WARN([An old version of $pkg_module_name (version $pkg_version) was found. You need at least version $test_version]) - fi - ) - else - dnl doesn't exist - AC_MSG_RESULT([($pkg_module_name)]) - if test x$4 = xfail ; then - AC_MSG_ERROR([$msg]) - else - AC_MSG_WARN([$msg]) - fi - fi - else - msg=`$PKG_CONFIG $module 2>&1` - if test -z "$msg"; then - echo $ac_n "$module " - pkg_list="$pkg_list $module" - else - AC_MSG_RESULT([($module)]) - if test x$4 = xfail ; then - AC_MSG_ERROR([$msg]) - else - AC_MSG_WARN([$msg]) - fi - fi - fi - fi - done - AC_MSG_RESULT([]) - if test -n "$pkg_list"; then - eval $name'_CFLAGS'=\"`$PKG_CONFIG --cflags $pkg_list`\" - eval $name'_LIBS'=\"`$PKG_CONFIG --libs $pkg_list`\" - if test -n "$depvar"; then - eval $depvar'_DEPENDS'=\"\$$depname'_DEPENDS' $pkg_list\" - else - eval $name'_DEPENDS'=\"$pkg_list\" - fi - if test -z "$4" ; then - eval 'HAVE_'$name=yes - fi - fi -]) - -AC_DEFUN([GNOME_PKGCONFIG_CHECK_MODULES], -[ - GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES($1,$2,$3,fail) -]) diff --git a/macros2/gnome-platform.m4 b/macros2/gnome-platform.m4 deleted file mode 100644 index 96b6c049..00000000 --- a/macros2/gnome-platform.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl -dnl GNOME_PLATFORM_GNOME_2(default, [force]) -dnl -dnl If the first parameter is `yes', then the default is -dnl the GNOME 2.x platform, otherwise the GNOME 1.x one. -dnl -dnl If the optional second parameter is `force', then use -dnl the default value without command line argument. -dnl - -AC_DEFUN([GNOME_PLATFORM_GNOME_2],[ - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) - - if test x$1 = xyes ; then - platform_gnome_2_default=yes - else - platform_gnome_2_default=no - fi - if test x$2 = xforce ; then - platform_gnome_2="$platform_gnome_2_default"; - else - AC_ARG_ENABLE(platform-gnome-2, [ --enable-platform-gnome-2 enable GNOME 2.x platform [default=no]],[platform_gnome_2="$enableval"],[platform_gnome_2="$platform_gnome_2_default"]) - fi - - AM_CONDITIONAL(PLATFORM_GNOME_2, test $platform_gnome_2 = yes) - - AC_MSG_CHECKING(for GNOME Platform) - if test $platform_gnome_2 = yes; then - AC_MSG_RESULT(GNOME 2.x) - GNOME_INTERFACE_VERSION=2 - else - AC_MSG_RESULT(GNOME 1.x) - GNOME_INTERFACE_VERSION=1 - fi - AC_SUBST(GNOME_INTERFACE_VERSION) -]) diff --git a/macros2/gnome-pthread-check.m4 b/macros2/gnome-pthread-check.m4 deleted file mode 100644 index a4eb3b48..00000000 --- a/macros2/gnome-pthread-check.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl -dnl And better, use gthreads instead... -dnl - -AC_DEFUN([GNOME_PTHREAD_CHECK],[ - PTHREAD_LIB="" - AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", - [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", - [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", - [AC_CHECK_FUNC(pthread_create)] - )] - )] - ) - AC_SUBST(PTHREAD_LIB) - AC_PROVIDE([GNOME_PTHREAD_CHECK]) -]) diff --git a/macros2/gnome-x-checks.m4 b/macros2/gnome-x-checks.m4 deleted file mode 100644 index 7081644e..00000000 --- a/macros2/gnome-x-checks.m4 +++ /dev/null @@ -1,53 +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 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([GNOME2_X_CHECKS], -[ - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) - - GNOME_PKGCONFIG_CHECK_MODULES(GTK, gtk+-2.0:1.3.1) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(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([GNOME2_X_CHECKS]) -]) diff --git a/macros2/linger.m4 b/macros2/linger.m4 deleted file mode 100644 index dfa7c8ae..00000000 --- a/macros2/linger.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl -dnl Check for struct linger -dnl -AC_DEFUN(AC_STRUCT_LINGER, [ -av_struct_linger=no -AC_MSG_CHECKING(struct linger is available) -AC_TRY_RUN([ -#include <sys/types.h> -#include <sys/socket.h> - -struct linger li; - -main () -{ - li.l_onoff = 1; - li.l_linger = 120; - exit (0); -} -],[ -AC_DEFINE(HAVE_STRUCT_LINGER) -av_struct_linger=yes -],[ -av_struct_linger=no -],[ -av_struct_linger=no -]) -AC_MSG_RESULT($av_struct_linger) -]) |