- generate Makefile.in from Makefile.am template
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2466 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/configure.ac b/common/configure.ac
index 4be7128..8e81bd8 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -2,11 +2,13 @@
AC_PREREQ([2.61])
AC_INIT([librfb], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
+
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
AC_LANG([C++])
@@ -45,17 +47,16 @@
dnl Checks for IRIX-specific Compression Library.
AC_CHECK_LIB(cl, clQuerySchemeFromName,
[AC_DEFINE(HAVE_CL)
- PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixCLJpegCompressor.cxx"
+ IRIX_COMPRESS=yes
LIBS="$LIBS -lcl"])
+AM_CONDITIONAL([IRIX_COMPRESS], [ test "x$IRIX_COMPRESS" = xyes ])
dnl Checks for IRIX-specific Digital Media libraries.
AC_CHECK_LIB(dmedia, dmICCreate,
[AC_DEFINE(HAVE_DMEDIA)
- PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMJpegCompressor.cxx"
- PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMIC_RawToJpeg.cxx"
+ IRIX_MEDIA=yes
LIBS="$LIBS -ldmedia"])
-
-AC_SUBST(PLATFORM_CXXSRCS)
+AM_CONDITIONAL([IRIX_MEDIA], [ test "x$IRIX_MEDIA" = xyes ])
AC_ARG_WITH([tight-zlib],
AS_HELP_STRING([--with-tight-zlib],
@@ -134,9 +135,8 @@
fi
fi
-AC_OUTPUT(Makefile:Makefile.in:$BOILERPLATE \
- rdr/Makefile:rdr/Makefile.in:$BOILERPLATE \
- network/Makefile:network/Makefile.in:$BOILERPLATE \
- Xregion/Makefile:Xregion/Makefile.in:$BOILERPLATE \
- rfb/Makefile:rfb/Makefile.in:$BOILERPLATE \
-)
+AC_OUTPUT([Makefile
+ rdr/Makefile
+ network/Makefile
+ Xregion/Makefile
+ rfb/Makefile])