diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-12-17 12:06:46 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-12-17 12:06:46 +0100 |
| commit | 0f0bcd76aff655b4d953791abd9753447897d9b9 (patch) | |
| tree | e1dfc078b4ca5d135e5f628e638677155d4f7522 | |
| parent | 68d207fffe7c2319fdb74faebaebf8f303a2f852 (diff) | |
| download | e2tools-0f0bcd76aff655b4d953791abd9753447897d9b9.tar.gz e2tools-0f0bcd76aff655b4d953791abd9753447897d9b9.tar.xz e2tools-0f0bcd76aff655b4d953791abd9753447897d9b9.zip | |
Use pkg-config for the libs, avoid AM_PROG_CC_C_O
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 5ab6326..037d501 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,12 @@ SUBDIRS = lib . ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = -I@includedir@ - bin_PROGRAMS = e2cp -e2cp_SOURCES = copy.c copy.h \ + +AM_CPPFLAGS = $(EXT2FS_CFLAGS) $(COM_ERR_CFLAGS) +e2cp_LDADD = $(EXT2FS_LIBS) $(COM_ERR_LIBS) +e2cp_SOURCES = \ + copy.c copy.h \ e2tools.c e2tools.h \ elist.c elist.h \ ln.c ln.h \ @@ -17,7 +19,7 @@ e2cp_SOURCES = copy.c copy.h \ tail.c tail.h \ util.c util.h \ write.c write.h -e2cp_LDADD = -L@libdir@ -lext2fs -lcom_err + EXTRA_DIST = README TODO e2tools.spec install-exec-hook: diff --git a/configure.in b/configure.in index bedbaa7..737a8c2 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([e2tools], [0.0.16.1], [hun@n-dimensional.de], [e2tools]) +AC_INIT([e2tools], [0.0.16.2], [hun@n-dimensional.de], [e2tools]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([e2tools.c]) @@ -13,10 +13,13 @@ gl_EARLY AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_CC_C_O dnl Checks for libraries. gl_INIT +PKG_CHECK_MODULES([EXT2FS], [ext2fs], [], [ + AC_MSG_ERROR([Sorry, but we do require libext2fs.])]) +PKG_CHECK_MODULES([COM_ERR], [com_err], [], [ + AC_MSG_ERROR([Sorry, but we do require libcom_err.])]) dnl Checks for header files. AC_HEADER_STDC |