-AC_CHECK_LIB(popt, poptPrintHelp)
-AC_CHECK_LIB(cygipc, semget)
-AC_CHECK_LIB(intl, gettext)
+AC_CHECK_LIB(popt, poptPrintHelp,[
+ AC_DEFINE(HAVE_LIBPOPT,1,[Define to 1 if you have the `popt' library (-lpopt).])])dnl '`
+AC_CHECK_FUNC(shmget,[
+ HAVE_INTRINSIC_IPC="yes"
+ ],[
+ HAVE_INTRINSIC_IPC="no"
+ ])
+
+# AC_CHECK_LIB(intl, gettext)
+AM_GNU_GETTEXT(external,[],[])
+AM_GNU_GETTEXT_VERSION([0.15])
+BUILD_INCLUDED_LIBINTL=no
+USE_INCLUDED_LIBINTL=no
+AC_SUBST(BUILD_INCLUDED_LIBINTL)
+AC_SUBST(USE_INCLUDED_LIBINTL)
+
+CYGICONS_DLL_VERSION=0
+AC_SUBST(CYGICONS_DLL_VERSION)