diff options
| author | nobody <nobody@localhost> | 2001-08-01 12:34:22 +0000 |
|---|---|---|
| committer | nobody <nobody@localhost> | 2001-08-01 12:34:22 +0000 |
| commit | 84c0a7f34cc09f2193c509448666979635c7bd6d (patch) | |
| tree | ae5a14fe280c82d939796156bb20a96d69c31d3b | |
| parent | f7d95b5d056e5243062c2dad6235d86aa566cf9e (diff) | |
| download | shared-mime-info-84c0a7f34cc09f2193c509448666979635c7bd6d.tar.gz | |
This commit was manufactured by cvs2svn to create branch
'gnome-1-4-branch'.
svn path=/branches/gnome-1-4-branch/; revision=1890
| -rw-r--r-- | macros/README.cvs-commits | 13 | ||||
| -rw-r--r-- | macros/psiconv.m4 | 53 |
2 files changed, 66 insertions, 0 deletions
diff --git a/macros/README.cvs-commits b/macros/README.cvs-commits new file mode 100644 index 00000000..88e3d581 --- /dev/null +++ b/macros/README.cvs-commits @@ -0,0 +1,13 @@ +This directory is *shared* between a lot of modules in GNOME CVS - +which means that every change you're doing here immediately affects +a very large number of modules. + +Please, do *ALWAYS ASK FIRST* on gnome-hackers@gnome.org before you +commit anything to this directory. If unsure, feel free to send me +a patch <martin@gnome.org> and I'll commit it for you it it's ok. + +Thanks for your understanding, + +August 1st, 2001 +Martin Baulig <martin@gnome.org> + diff --git a/macros/psiconv.m4 b/macros/psiconv.m4 new file mode 100644 index 00000000..eaf56f43 --- /dev/null +++ b/macros/psiconv.m4 @@ -0,0 +1,53 @@ +dnl +dnl PSICONV_INIT +dnl + +AC_DEFUN([PSICONV_INIT],[ + AC_SUBST(PSICONV_LIBS) + AC_SUBST(PSICONV_CFLAGS) + + AC_ARG_WITH(psiconv-includes, + [ --with-psiconv-includes Specify location of Psiconv headers],[ + psiconv_cflags="-I$withval" + ]) + + AC_ARG_WITH(psiconv-libs, + [ --with-psiconv-libs Specify location of Psiconv libs],[ + psiconv_libs="-L$withval" + ]) + + AC_ARG_WITH(psiconv, + [ --with-psiconv Enable/disable Psiconv support], + if test x$withval = xyes; then + want_psiconv=yes + else + if test "x$withval" = xno; then + want_psiconv=no + else + want_psiconv=yes + fi + fi, + want_psiconv=yes) + + + if test "$want_psiconv" = "yes"; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $psiconv_cflags" + LIBS="$LIBS $psiconv_libs" + AC_CHECK_LIB(psiconv,psiconv_parse,want_psiconv=yes,want_psiconv=no) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "$want_psiconv" = "yes"; then + PSICONV_LIBS="${psiconv_libs} -lpsiconv" + PSICONV_CFLAGS="$psiconv_cflags" + with_psiconv=true + else + PSICONV_LIBS="" + PSICONV_CFLAGS="" + with_psiconv=false + fi + AM_CONDITIONAL(WITH_PSICONV,$with_psiconv) +]) |