Browse files

Clean up dependencies

- Remove perl dependency (sed works just fine)
- Make mdtool and unix2dos optional
  • Loading branch information...
1 parent a6f3b9e commit 4cb887b2e0098707563861a28675896c27cf7688 @shana committed Apr 13, 2016
Showing with 14 additions and 20 deletions.
  1. +2 −2 bindinate/bindinate.in
  2. +6 −6 bindinate/configure.ac.template
  3. +6 −12 configure.ac
View
4 bindinate/bindinate.in
@@ -457,8 +457,8 @@ for profile in $PROFILES; do
done
cat @prefix@/lib/bindinator/Bindings.sln.template | \
- @PERL@ -pe "s|#PROJECT_DEFS#|${PROJ_DEFS}|g" | \
- @PERL@ -pe "s,#BUILD_CONFIGS#,${BUILD_CONFIGS},g" | \
+ sed 's|#PROJECT_DEFS#|${PROJ_DEFS}|g' | \
+ sed 's,#BUILD_CONFIGS#,${BUILD_CONFIGS},g' | \
@UNIX2DOS@ > "${OUTDIR}/${NAME}-sharp.sln"
cp @prefix@/lib/bindinator/csproj.xslt "${OUTDIR}/sources/csproj.xslt"
View
12 bindinate/configure.ac.template
@@ -94,15 +94,15 @@ if test "x$XSLTPROC" = "xno" ; then
fi
AC_SUBST(XSLTPROC)
-AC_PATH_PROG(UNIX2DOS, unix2dos, no)
-if test "x$UNIX2DOS" = "xno" ; then
- AC_MSG_ERROR([dos2unix and unix2dos not found])
+AC_PATH_PROG(UNIX2DOS, unix2dos, [cat -])
+if test "x$UNIX2DOS" = "xcat -" ; then
+ AC_MSG_RESULT([unix2dos not found, using cat])
fi
AC_SUBST(UNIX2DOS)
-AC_PATH_PROG(MDTOOL, mdtool, no)
-if test "x$MDTOOL" = "xno" ; then
- AC_MSG_ERROR([mdtool not found])
+AC_PATH_PROG(MDTOOL, mdtool, echo)
+if test "x$MDTOOL" = "xecho" ; then
+ AC_MSG_RESULT([mdtool not found, csproj conversion won't run])
fi
AC_SUBST(MDTOOL)
View
18 configure.ac
@@ -13,13 +13,13 @@ AC_SUBST(XSLTPROC)
AC_PATH_PROG(XMLLINT, xmllint, no)
if test "x$XMLLINT" = "xno" ; then
- AC_MSG_ERROR([xmllint not found])
+ AC_MSG_ERROR([xmllint not found. Install libxml2-utils to get it.])
fi
AC_SUBST(XMLLINT)
PKG_CHECK_MODULES(GIR, gobject-introspection-1.0, has_gir=true, has_gir=false)
if test "x$has_gir" = "xfalse"; then
- AC_MSG_ERROR([gobject-introspection not found, cannot determine gir directory])
+ AC_MSG_ERROR([gobject-introspection not found, cannot determine gir directory. Install libgirepository1.0-dev to get it.])
fi
GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`/
@@ -39,19 +39,13 @@ AC_SUBST(GAPIFIXUP)
AC_PATH_PROG(UUIDGEN, uuidgen, no)
if test "x$UUIDGEN" = "xno" ; then
- AC_MSG_ERROR([uuidgen not found])
+ AC_MSG_ERROR([uuidgen not found. Install uuid-runtime to get it.])
fi
AC_SUBST(UUIDGEN)
-AC_PATH_PROG(PERL, perl, no)
-if test "x$PERL" = "xno" ; then
- AC_MSG_ERROR([perl not found])
-fi
-AC_SUBST(PERL)
-
-AC_PATH_PROG(UNIX2DOS, unix2dos, no)
-if test "x$UNIX2DOS" = "xno" ; then
- AC_MSG_ERROR([dos2unix and unix2dos not found])
+AC_PATH_PROG(UNIX2DOS, unix2dos, [cat -])
+if test "x$UNIX2DOS" = "xcat -" ; then
+ AC_MSG_RESULT([unix2dos not found, using cat])
fi
AC_SUBST(UNIX2DOS)

0 comments on commit 4cb887b

Please sign in to comment.