Now using pkgconfig for library dependencies.

2007-05-13 14:36:05 +00:00 · 2007-05-13 14:36:05 +00:00 · 9f569bf769
commit 9f569bf769
parent 4dede11720
7 changed files with 2550 additions and 1885 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -3,6 +3,8 @@ nobase_games_SCRIPTS  = zoom
 nobase_games_DATA     = levels/* tex/*
 nobase_games_PROGRAMS = zoom-bin
 zoom_bin_SOURCES      = zoom-bin.c
+zoom_bin_CFLAGS       = @libzoom_CFLAGS@
+zoom_bin_LDADD        = @libzoom_LIBS@

 EXTRA_DIST = zoom levels/* tex/*

--- a/Makefile.in
+++ b/Makefile.in
@ -74,12 +74,12 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@ -88,18 +88,27 @@ am__quote = @am__quote@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libzoom_CFLAGS = @libzoom_CFLAGS@
+libzoom_LIBS = @libzoom_LIBS@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@ -109,6 +118,8 @@ nobase_games_SCRIPTS = zoom
 nobase_games_DATA = levels/* tex/*
 nobase_games_PROGRAMS = zoom-bin
 zoom_bin_SOURCES = zoom-bin.c
+zoom_bin_CFLAGS = @libzoom_CFLAGS@
+zoom_bin_LDADD = @libzoom_LIBS@

 EXTRA_DIST = zoom levels/* tex/*
 subdir = .
@ -119,9 +130,8 @@ CONFIG_CLEAN_FILES =
 nobase_games_PROGRAMS = zoom-bin$(EXEEXT)
 PROGRAMS = $(nobase_games_PROGRAMS)

-am_zoom_bin_OBJECTS = zoom-bin.$(OBJEXT)
+am_zoom_bin_OBJECTS = zoom_bin-zoom-bin.$(OBJEXT)
 zoom_bin_OBJECTS = $(am_zoom_bin_OBJECTS)
-zoom_bin_LDADD = $(LDADD)
 zoom_bin_DEPENDENCIES =
 zoom_bin_LDFLAGS =
 SCRIPTS = $(nobase_games_SCRIPTS)
@ -130,7 +140,7 @@ SCRIPTS = $(nobase_games_SCRIPTS)
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/zoom-bin.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/zoom_bin-zoom-bin.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@ -139,7 +149,7 @@ DIST_SOURCES = $(zoom_bin_SOURCES)
 DATA = $(nobase_games_DATA)

 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
+	COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 compile \
 	config.h.in configure configure.in depcomp install-sh missing \
 	mkinstalldirs
 SOURCES = $(zoom_bin_SOURCES)
@ -240,7 +250,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-bin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom_bin-zoom-bin.Po@am__quote@

 .c.o:
@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@ -263,6 +273,28 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+zoom_bin-zoom-bin.o: zoom-bin.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.o -MD -MP -MF "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" "$(DEPDIR)/zoom_bin-zoom-bin.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zoom_bin-zoom-bin.Po' tmpdepfile='$(DEPDIR)/zoom_bin-zoom-bin.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c
+
+zoom_bin-zoom-bin.obj: zoom-bin.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.obj -MD -MP -MF "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" "$(DEPDIR)/zoom_bin-zoom-bin.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zoom_bin-zoom-bin.Po' tmpdepfile='$(DEPDIR)/zoom_bin-zoom-bin.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`
 uninstall-info-am:
 nobase_gamesDATA_INSTALL = $(install_sh_DATA)
 install-nobase_gamesDATA: $(nobase_games_DATA)
--- a/aclocal.m4
+++ b/aclocal.m4
@ -872,3 +872,161 @@ AC_DEFUN([AM_MAINTAINER_MODE],

 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])

+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
--- a/1
+++ b/1
@ -0,0 +1 @@
+/usr/share/automake-1.7/compile
--- a/config.h.in
+++ b/config.h.in
@ -3,9 +3,6 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY

-/* Define to 1 if you have the `zoom' library (-lzoom). */
-#undef HAVE_LIBZOOM
-
 /* Name of package */
 #undef PACKAGE

--- a/4224
+++ b/4224
--- a/configure.in
+++ b/configure.in
@ -11,9 +11,10 @@ AM_MAINTAINER_MODE

 # Checks for programs.
 AC_PROG_CC
+PKG_PROG_PKG_CONFIG

 # Checks for libraries.
-AC_CHECK_LIB([zoom], [Render], , AC_MSG_ERROR([libzoom not found]))
+PKG_CHECK_MODULES(libzoom, libzoom-0.1, , AC_MSG_ERROR(Test for libzoom failed.))

 # Checks for header files.