diff options
| author | Jody Goldberg <jgoldberg@home.com> | 2001-07-25 00:33:17 +0000 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2001-07-25 00:33:17 +0000 |
| commit | 51b7010c51a4e573e91e725f22498b9af1f311d0 (patch) | |
| tree | 420e00075e2ba27fccfaa4b9080a73cf471bdd00 | |
| parent | 211a7d3850fe2c20d7b1208c34e54d7505139cd4 (diff) | |
| download | gnome-common-51b7010c51a4e573e91e725f22498b9af1f311d0.tar.gz | |
Add psion macros from Frodo Looijaard <frodol@dds.nl>
2001-07-24 Jody Goldberg <jgoldberg@home.com>
* psiconv.m4 : Add psion macros from Frodo Looijaard <frodol@dds.nl>
svn path=/trunk/; revision=1858
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/psiconv.m4 | 53 |
2 files changed, 57 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index f7c7173..4b2db43 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +2001-07-24 Jody Goldberg <jgoldberg@home.com> + + * psiconv.m4 : Add psion macros from Frodo Looijaard <frodol@dds.nl> + 2001-07-24 Frederic Crozat <fcrozat@mandrakesoft.com> * gnome-print-check.m4 (AM_PATH_GNOME_PRINT): diff --git a/macros/psiconv.m4 b/macros/psiconv.m4 new file mode 100644 index 0000000..eaf56f4 --- /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) +]) |