--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,20 +1,17 @@
dnl
dnl Local autoconf macros used with mozilla
dnl The contents of this file are under the Public Domain.
dnl
builtin(include, build/autoconf/glib.m4)dnl
-builtin(include, build/autoconf/gtk.m4)dnl
builtin(include, build/autoconf/libIDL.m4)dnl
-builtin(include, build/autoconf/libIDL-2.m4)dnl
builtin(include, build/autoconf/nspr.m4)dnl
builtin(include, build/autoconf/nss.m4)dnl
-builtin(include, build/autoconf/libart.m4)dnl
builtin(include, build/autoconf/pkg.m4)dnl
builtin(include, build/autoconf/freetype2.m4)dnl
builtin(include, build/autoconf/codeset.m4)dnl
builtin(include, build/autoconf/altoptions.m4)dnl
# Read the user's .mozconfig script. We can't do this in
# configure.in: autoconf puts the argument parsing code above anything
# expanded from configure.in, and we need to get the configure options
deleted file mode 100644
--- a/build/autoconf/gtk.m4
+++ /dev/null
@@ -1,191 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor 97-11-3
-# (copy of gtk.m4 (public domain))
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN([AM_PATH_GTK],
-[dnl
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
- gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX
- Exec prefix where GTK is installed (optional)],
- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
- , enable_gtktest=yes)
-
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
- fi
- fi
-
- dnl Force a version check to keep upgraded versions from being overridden by the cached value.
- unset ac_cv_path_GTK_CONFIG
-
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
- if test "$GTK_CONFIG" = "no" ; then
- no_gtk=yes
- else
- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gtktest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If gtk-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
- {
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
- else
- {
- if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GTK_CONFIG" = "no" ; then
- echo "*** The gtk-config script installed by GTK could not be found."
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GTK_CONFIG environment variable to the"
- echo "*** full path to gtk-config."
- echo "*** GTK+ is available from ftp://ftp.gtk.org/pub/gtk"
- else
- if test -f conf.gtktest ; then
- :
- else
- echo "*** Could not run GTK test program, checking why..."
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK or finding the wrong"
- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***"
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
- echo "*** came with the system with the command"
- echo "***"
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GTK_CFLAGS=""
- GTK_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- rm -f conf.gtktest
-])
deleted file mode 100644
--- a/build/autoconf/libIDL-2.m4
+++ /dev/null
@@ -1,196 +0,0 @@
-# Configure paths for LIBIDL
-
-dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBIDL_2],
-[dnl
-dnl Get the cflags and libraries from the libIDL-config-2 script
-dnl
-AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX
- Prefix where libIDL is installed (optional)],
- libIDL_config_prefix="$withval", libIDL_config_prefix="")
-AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX
- Exec prefix where libIDL is installed (optional)],
- libIDL_config_exec_prefix="$withval", libIDL_config_exec_prefix="")
-AC_ARG_ENABLE(libIDLtest, [ --disable-libIDLtest Do not try to compile and run a test libIDL program],
- , enable_libIDLtest=yes)
-
- if test x$libIDL_config_exec_prefix != x ; then
- libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix"
- if test x${LIBIDL_CONFIG+set} != xset ; then
- LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config-2
- fi
- fi
- if test x$libIDL_config_prefix != x ; then
- libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix"
- if test x${LIBIDL_CONFIG+set} != xset ; then
- LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config-2
- fi
- fi
-
- dnl Force a version check to keep upgraded versions from being overridden by the cached value.
- unset ac_cv_path_LIBIDL_CONFIG
-
- AC_PATH_PROG(LIBIDL_CONFIG, libIDL-config-2, no)
- min_libIDL_version=ifelse([$1], ,0.6.0,$1)
- AC_MSG_CHECKING(for libIDL - version >= $min_libIDL_version)
- no_libIDL=""
- if test "$LIBIDL_CONFIG" = "no" ; then
- no_libIDL=yes
- else
- LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
- LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
- # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
- # this after we start requiring libIDL 0.6.8 or anything higher
- LIBIDL_CFLAGS="$GLIB_CFLAGS $LIBIDL_CFLAGS"
- LIBIDL_LIBS="$GLIB_LIBS $LIBIDL_LIBS"
- libIDL_config_major_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- libIDL_config_minor_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- libIDL_config_micro_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_libIDLtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
- LIBS="$LIBIDL_LIBS $LIBS"
-dnl
-dnl Now check if the installed LIBIDL is sufficiently new.
-dnl
- rm -f conf.libIDLtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-
-int
-main ()
-{
- int major, minor, micro;
- int libIDL_major_version;
- int libIDL_minor_version;
- int libIDL_micro_version;
- char *tmp_version;
-
- system ("touch conf.libIDLtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup ("$min_libIDL_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_libIDL_version");
- exit(1);
- }
- tmp_version = g_strdup (IDL_get_libver_string ());
- if (sscanf(tmp_version, "%d.%d.%d",
- &libIDL_major_version,
- &libIDL_minor_version,
- &libIDL_micro_version) != 3) {
- printf("%s, bad version string\n", tmp_version);
- exit(1);
- }
-
- if ((libIDL_major_version != $libIDL_config_major_version) ||
- (libIDL_minor_version != $libIDL_config_minor_version) ||
- (libIDL_micro_version != $libIDL_config_micro_version))
- {
- printf("\n*** 'libIDL-config-2 --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n",
- $libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version,
- libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
- printf ("*** was found! If libIDL-config-2 was correct, then it is best\n");
- printf ("*** to remove the old version of LIBIDL. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If libIDL-config-2 was wrong, set the environment variable LIBIDL_CONFIG\n");
- printf("*** to point to the correct copy of libIDL-config-2, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
- else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) ||
- (libIDL_minor_version != LIBIDL_MINOR_VERSION) ||
- (libIDL_micro_version != LIBIDL_MICRO_VERSION))
- {
- printf("\n*** libIDL header files (version %d.%d.%d) do not match\n",
- LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
- }
- else
- {
- if ((libIDL_major_version > major) ||
- ((libIDL_major_version == major) && (libIDL_minor_version > minor)) ||
- ((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n",
- libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
- printf("*** You need at least libIDL version %d.%d.%d.\n",
- major, minor, micro);
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the libIDL-config-2 shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n");
- printf("*** correct copy of libIDL-config-2. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_libIDL=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_libIDL" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$LIBIDL_CONFIG" = "no" ; then
- echo "*** The libIDL-config-2 script installed by libIDL could not be found"
- echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the LIBIDL_CONFIG environment variable to the"
- echo "*** full path to libIDL-config-2."
- else
- if test -f conf.libIDLtest ; then
- :
- else
- echo "*** Could not run libIDL test program, checking why..."
- CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
- LIBS="$LIBS $LIBIDL_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-], [ return IDL_get_libver_string ? 1 : 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding libIDL or finding the wrong"
- echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means libIDL was incorrectly installed"
- echo "*** or that you have moved libIDL since it was installed. In the latter case, you"
- echo "*** may want to edit the libIDL-config-2 script: $LIBIDL_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- LIBIDL_CFLAGS=""
- LIBIDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(LIBIDL_CFLAGS)
- AC_SUBST(LIBIDL_LIBS)
- rm -f conf.libIDLtest
-])
deleted file mode 100644
--- a/build/autoconf/libart.m4
+++ /dev/null
@@ -1,165 +0,0 @@
-# Configure paths for LIBART
-# Raph Levien 98-11-18
-# stolen from Manish Singh 98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBART],
-[dnl
-dnl Get the cflags and libraries from the libart-config script
-dnl
-AC_ARG_WITH(libart-prefix,[ --with-libart-prefix=PFX Prefix where LIBART is installed (optional)],
- libart_prefix="$withval", libart_prefix="")
-AC_ARG_WITH(libart-exec-prefix,[ --with-libart-exec-prefix=PFX Exec prefix where LIBART is installed (optional)],
- libart_exec_prefix="$withval", libart_exec_prefix="")
-AC_ARG_ENABLE(libarttest, [ --disable-libarttest Do not try to compile and run a test LIBART program],
- , enable_libarttest=yes)
-
- if test x$libart_exec_prefix != x ; then
- libart_args="$libart_args --exec-prefix=$libart_exec_prefix"
- if test x${LIBART_CONFIG+set} != xset ; then
- LIBART_CONFIG=$libart_exec_prefix/bin/libart-config
- fi
- fi
- if test x$libart_prefix != x ; then
- libart_args="$libart_args --prefix=$libart_prefix"
- if test x${LIBART_CONFIG+set} != xset ; then
- LIBART_CONFIG=$libart_prefix/bin/libart-config
- fi
- fi
-
- AC_PATH_PROG(LIBART_CONFIG, libart-config, no)
- min_libart_version=ifelse([$1], ,0.2.5,$1)
- AC_MSG_CHECKING(for LIBART - version >= $min_libart_version)
- no_libart=""
- if test "$LIBART_CONFIG" = "no" ; then
- no_libart=yes
- else
- LIBART_CFLAGS=`$LIBART_CONFIG $libartconf_args --cflags`
- LIBART_LIBS=`$LIBART_CONFIG $libartconf_args --libs`
-
- libart_major_version=`$LIBART_CONFIG $libart_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- libart_minor_version=`$LIBART_CONFIG $libart_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- libart_micro_version=`$LIBART_CONFIG $libart_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_libarttest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $LIBART_CFLAGS"
- LIBS="$LIBS $LIBART_LIBS"
-dnl
-dnl Now check if the installed LIBART is sufficiently new. (Also sanity
-dnl checks the results of libart-config to some extent
-dnl
- rm -f conf.libarttest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libart_lgpl/libart.h>
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.libarttest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_libart_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_libart_version");
- exit(1);
- }
-
- if (($libart_major_version > major) ||
- (($libart_major_version == major) && ($libart_minor_version > minor)) ||
- (($libart_major_version == major) && ($libart_minor_version == minor) && ($libart_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'libart-config --version' returned %d.%d.%d, but the minimum version\n", $libart_major_version, $libart_minor_version, $libart_micro_version);
- printf("*** of LIBART required is %d.%d.%d. If libart-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If libart-config was wrong, set the environment variable LIBART_CONFIG\n");
- printf("*** to point to the correct copy of libart-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_libart=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_libart" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$LIBART_CONFIG" = "no" ; then
- echo "*** The libart-config script installed by LIBART could not be found"
- echo "*** If LIBART was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the LIBART_CONFIG environment variable to the"
- echo "*** full path to libart-config."
- else
- if test -f conf.libarttest ; then
- :
- else
- echo "*** Could not run LIBART test program, checking why..."
- CFLAGS="$CFLAGS $LIBART_CFLAGS"
- LIBS="$LIBS $LIBART_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <libart_lgpl/libart.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding LIBART or finding the wrong"
- echo "*** version of LIBART. If it is not finding LIBART, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBART was incorrectly installed"
- echo "*** or that you have moved LIBART since it was installed. In the latter case, you"
- echo "*** may want to edit the libart-config script: $LIBART_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- LIBART_CFLAGS=""
- LIBART_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(LIBART_CFLAGS)
- AC_SUBST(LIBART_LIBS)
- rm -f conf.libarttest
-])
deleted file mode 100755
--- a/build/autoconf/update-makefile.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# This script will generate a single Makefile from a Makefile.in using
-# the config.status script.
-#
-# The config.status script is generated the first time you run
-# ./configure.
-#
-#
-# Usage: update-makefile.sh
-#
-# Send comments, improvements, bugs to ramiro@netscape.com
-#
-
-update_makefile_usage() {
- _progname=`expr //$0 : '.*/\(.*\)'`
- cat <<END_USAGE 2>&1
-
-Usage: $_progname [-h -u] [<keyword>]
- -d <dir> Subdir to update
- -h Print usage
-END_USAGE
-}
-
-# Parse the command-line options
-#
-subdir=
-while getopts d:h OPT; do
- case $OPT in
- d) # Make sure "subdir" has exactly one ending slash
- subdir=`echo $OPTARG | sed 's/\/$//;'`"/" ;;
- \?|h) update_makefile_usage
- exit 1
- ;;
- esac
-done
-
-
-# find_depth: Pull the value of DEPTH out of Makefile (or Makefile.in)
-find_depth() {
- egrep '^DEPTH[ ]*=[ ]*\.' $1 | awk -F= '{ print $2; }'
-}
-
-# The Makefile to create
-target_makefile=`pwd`"/${subdir}Makefile"
-
-# Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
-if [ -f Makefile.in ]
-then
- depth=`find_depth Makefile.in`
-elif [ -f Makefile ]
-then
- depth=`find_depth Makefile`
-elif [ -f ../Makefile ]
-then
- depth="../"`find_depth Makefile`
-else
- echo
- echo "There ain't no 'Makefile' or 'Makefile.in' over here: $pwd"
- echo
- exit
-fi
-
-# 'cd' to the root of the tree to run "config.status" there
-cd $depth
-
-# Strip the tree root off the Makefile's path
-#
-root_path=`pwd`
-target_makefile=`expr $target_makefile : $root_path'/\(.*\)'`
-
-# Make sure config.status exists
-#
-if [ -f config.status ]
-then
- CONFIG_FILES=$target_makefile ./config.status
-else
- echo
- echo "There ain't no 'config.status' over here: $pwd"
- echo
-fi
deleted file mode 100644
--- a/js/src/build/autoconf/update-makefile.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# This script will generate a single Makefile from a Makefile.in using
-# the config.status script.
-#
-# The config.status script is generated the first time you run
-# ./configure.
-#
-#
-# Usage: update-makefile.sh
-#
-# Send comments, improvements, bugs to ramiro@netscape.com
-#
-
-update_makefile_usage() {
- _progname=`expr //$0 : '.*/\(.*\)'`
- cat <<END_USAGE 2>&1
-
-Usage: $_progname [-h -u] [<keyword>]
- -d <dir> Subdir to update
- -h Print usage
-END_USAGE
-}
-
-# Parse the command-line options
-#
-subdir=
-while getopts d:h OPT; do
- case $OPT in
- d) # Make sure "subdir" has exactly one ending slash
- subdir=`echo $OPTARG | sed 's/\/$//;'`"/" ;;
- \?|h) update_makefile_usage
- exit 1
- ;;
- esac
-done
-
-
-# find_depth: Pull the value of DEPTH out of Makefile (or Makefile.in)
-find_depth() {
- egrep '^DEPTH[ ]*=[ ]*\.' $1 | awk -F= '{ print $2; }'
-}
-
-# The Makefile to create
-target_makefile=`pwd`"/${subdir}Makefile"
-
-# Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
-if [ -f Makefile.in ]
-then
- depth=`find_depth Makefile.in`
-elif [ -f Makefile ]
-then
- depth=`find_depth Makefile`
-elif [ -f ../Makefile ]
-then
- depth="../"`find_depth Makefile`
-else
- echo
- echo "There ain't no 'Makefile' or 'Makefile.in' over here: $pwd"
- echo
- exit
-fi
-
-# 'cd' to the root of the tree to run "config.status" there
-cd $depth
-
-# Strip the tree root off the Makefile's path
-#
-root_path=`pwd`
-target_makefile=`expr $target_makefile : $root_path'/\(.*\)'`
-
-# Make sure config.status exists
-#
-if [ -f config.status ]
-then
- CONFIG_FILES=$target_makefile ./config.status
-else
- echo
- echo "There ain't no 'config.status' over here: $pwd"
- echo
-fi