projects / packages / libgtop.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a780ca3 | 1 | diff -urN libgtop-2.0.1.orig/acinclude.m4 libgtop-2.0.1/acinclude.m4 |
| 2 | --- libgtop-2.0.1.orig/acinclude.m4 Mon Jan 13 22:23:10 2003 | |
| 3 | +++ libgtop-2.0.1/acinclude.m4 Mon Jan 13 22:23:33 2003 | |
| 5094b6be | 4 | @@ -517,10 +517,10 @@ |
| 5 | # this should go away soon | |
| 6 | need_gnome_support=yes | |
| 7 | ||
| 8 | - save_LIBOBJS="$LIBOBJS" | |
| 9 | - LIBOBJS= | |
| edc684ae | 10 | - |
| 5094b6be | 11 | - AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") |
| edc684ae MM |
12 | + AC_CHECK_FUNCS(getopt_long,,[ |
| 13 | + AC_LIBOBJ([getopt]) | |
| 14 | + AC_LIBOBJ([getopt1]) | |
| 15 | + ]) | |
| 5094b6be | 16 | |
| 17 | # for `scandir' | |
| 18 | AC_HEADER_DIRENT | |
| 19 | @@ -545,7 +545,7 @@ | |
| 20 | AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen) | |
| 21 | AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf) | |
| 22 | ||
| 23 | - AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o") | |
| edc684ae | 24 | + AC_CHECK_FUNCS(realpath,,[AC_LIBOBJ([canonicalize])]) |
| 5094b6be | 25 | |
| 26 | # to include `error.c' error.c has some HAVE_* checks | |
| 27 | AC_CHECK_FUNCS(vprintf doprnt strerror_r) | |
| edc684ae | 28 | @@ -555,9 +555,8 @@ |
| 5094b6be | 29 | am_cv_lib_error_at_line=yes, |
| 30 | am_cv_lib_error_at_line=no)]) | |
| 31 | if test $am_cv_lib_error_at_line = no; then | |
| 32 | - LIBOBJS="$LIBOBJS error.o" | |
| 33 | + AC_LIBOBJ([error]) | |
| 34 | fi | |
| 35 | - AC_SUBST(LIBOBJS)dnl | |
| 5094b6be | 36 | |
| 37 | # This is required if we declare setreuid () and setregid (). | |
| 38 | AC_TYPE_UID_T | |
| edc684ae | 39 | @@ -574,11 +573,11 @@ |
| 5094b6be | 40 | |
| 41 | # Turn our LIBOBJS into libtool objects. This is gross, but it | |
| 42 | # requires changes to autoconf before it goes away. | |
| 43 | - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` | |
| edc684ae MM |
44 | + LTLIBOBJS=`echo "$LIB@&t@OBJS" | |
| 45 | + sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'` | |
| 5094b6be | 46 | AC_SUBST(need_gnome_support) |
| 47 | AC_SUBST(LTLIBOBJS) | |
| 48 | ||
| 49 | - LIBOBJS="$save_LIBOBJS" | |
| 5094b6be | 50 | AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes) |
| 51 | ]) | |
| 52 | ||
| 0a780ca3 | 53 | diff -urN libgtop-2.0.1.orig/configure.in libgtop-2.0.1/configure.in |
| 54 | --- libgtop-2.0.1.orig/configure.in Mon Jan 13 22:23:10 2003 | |
| 55 | +++ libgtop-2.0.1/configure.in Mon Jan 13 22:23:33 2003 | |
| edc684ae MM |
56 | @@ -51,6 +51,7 @@ |
| 57 | AC_ISC_POSIX | |
| 58 | AC_PROG_CC | |
| 59 | AC_STDC_HEADERS | |
| 60 | +AM_PROG_AS | |
| 61 | dnl AC_ARG_PROGRAM | |
| 62 | ||
| 63 | dnl We need this at some places. |