diff options
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 17 |
2 files changed, 12 insertions, 10 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 390b5c6793..c05403049a 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +1998-11-04 Raja R Harinath <harinath@cs.umn.edu> + + * gnome-support.m4 (need_gnome_support): Set this unconditionally + to `yes'. We'll soon be losing this variable. + 1998-10-20 Andrew Veliath <andrewtv@usa.net> * gnome-orbit-check.m4 (GNOME_ORBIT_HOOK): Add ORBIT_IDL diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4 index e760fdc711..8728bb174a 100644 --- a/macros/gnome-support.m4 +++ b/macros/gnome-support.m4 @@ -1,14 +1,15 @@ 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. +dnl Gnome libraries. Sets LIBOBJS, might define some macros. +dnl This should only be used when building the Gnome libs; +dnl Gnome clients should not need this macro. AC_DEFUN([GNOME_SUPPORT_CHECKS],[ # we need an `awk' to build `gnomesupport.h' AC_REQUIRE([AC_PROG_AWK]) - need_gnome_support=no + + # this should go away soon + need_gnome_support=yes + save_LIBOBJS="$LIBOBJS" LIBOBJS= @@ -65,7 +66,6 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[ AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen) AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf) - #AC_CHECK_FUNCS(canonicalize_file_name,,LIBOBJS="$LIBOBJS canonicalize.o") AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o") # to include `error.c' error.c has some HAVE_* checks @@ -80,9 +80,6 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[ AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h) GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize) - if test "$LIBOBJS$gcc_need_declarations" != ""; 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'` |