diff options
| author | Manish Singh <yosh@src.gnome.org> | 1999-06-02 18:45:22 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 1999-06-02 18:45:22 +0000 |
| commit | eefbd04215e3d1c891efaacb5d076564244e802d (patch) | |
| tree | 7ef3fa171ef22c8233e4cd543e3adc4da04506e7 /acinclude.m4 | |
| parent | 1d375ea289c53f8a1d67f4f0f29428981b83e947 (diff) | |
| download | gtk+-eefbd04215e3d1c891efaacb5d076564244e802d.tar.gz | |
upgrade to libtool 1.3.2 (BeOS changes merged)
-Yosh
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2ff7640ad7..f9e725a7b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,8 +423,8 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Macro to add for using GNU gettext. # Ulrich Drepper <drepper@cygnus.com>, 1995. |