projects
/
profile
/
ivi
/
wayland.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename source subdir from wayland to src
[profile/ivi/wayland.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
4ab0955
..
bac5a0f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,19
+1,40
@@
-AC_INIT(wayland, 0.1)
+AC_PREREQ([2.64])
+AC_INIT([wayland],
+ [0.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
+ [wayland],
+ [http://wayland.freedesktop.org/])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
+
+AM_SILENT_RULES([yes])
+
+# Check for programs
AC_PROG_CC
AC_PROG_CC
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi])
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi])
-PKG_CHECK_MODULES(COMPOSITOR,
- [egl gl libpng cairo gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.17] xcb-dri2 xcb-xfixes)
-PKG_CHECK_MODULES(CLIENT, [egl gl cairo-gl gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon libdrm])
-PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0])
-
-if test $CC = gcc; then
+if test "x$GCC" = "xyes"; then
GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
fi
AC_SUBST(GCC_CFLAGS)
GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
fi
AC_SUBST(GCC_CFLAGS)
+AC_ARG_ENABLE([scanner],
+ [AC_HELP_STRING([--disable-scanner],
+ [Disable compilation of wayland-scannner])],
+ [],
+ [enable_scanner=yes])
+
+AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
+
EXPAT_LIB=""
AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
[ expat=$withval
EXPAT_LIB=""
AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
[ expat=$withval
@@
-25,5
+46,9
@@
AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS)
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS)
-AC_CONFIG_FILES([config.mk wayland-server.pc wayland-client.pc])
+AC_CONFIG_FILES([Makefile
+ wayland-scanner.m4
+ src/Makefile
+ src/wayland-server.pc
+ src/wayland-client.pc])
AC_OUTPUT
AC_OUTPUT