[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:31 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=079d625
The following commit has been merged in the master branch:
commit 079d625354134f639a0e65714ff310844c044d14
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Jul 9 10:14:52 2004 +0000
Autoconf, part 1
---
Makefile | 5 ++-
config.h | 19 ---------
config.h.in | 106 ++++++++++++++++++++++++++++++++++++++++++++++
config.mk => config.mk.in | 49 ++++++++++++---------
configure.ac | 40 +++++++++++++++++
5 files changed, 178 insertions(+), 41 deletions(-)
diff --git a/Makefile b/Makefile
index 28520fc..8483e44 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
#
# RCS information
# $Name: $
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
# Description:
# This makefile just forwards to src/Makefile.
@@ -24,3 +24,6 @@ doc:
maintainer-clean:
cd src && $(MAKE) $(MAKECMDGOALS)
cd doc && $(MAKE) $(MAKECMDGOALS)
+ rm -f *~ *#
+ rm -f config.h config.mk config.log configure
+ rm -rf autom4te.cache/
diff --git a/config.h b/config.h
deleted file mode 100644
index be794a6..0000000
--- a/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* config.h. Should be a generated file, eventually... */
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Exiv2"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Exiv2 version 0.4"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "exiv2"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.4"
-
-/* Define as 1 if you have the timegm function */
-#define HAVE_TIMEGM 1
-
-/* Define as 1 if you have unistd.h */
-#define HAVE_UNISTD_H 1
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..114c49b
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,106 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+ to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+ zero-length file name argument. */
+#undef HAVE_STAT_EMPTY_STRING_BUG
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+ slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/config.mk b/config.mk.in
similarity index 84%
rename from config.mk
rename to config.mk.in
index 140306a..507e22e 100644
--- a/config.mk
+++ b/config.mk.in
@@ -19,14 +19,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#
-# File: config.mk
-# Version: $Name: $ $Revision: 1.6 $
+# File: config.mk.in
+# Version: $Name: $ $Revision: 1.1 $
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History: 10-Dec-03, ahu: created
#
# Description:
-# System configuration file for GNU/Linux: gcc 3.x on Debian GNU/Linux
-# running Linux kernel 2.2.x or higher
+# Exiv2 system configuration file.
#
# **********************************************************************
@@ -36,10 +35,14 @@ STATIC_LIBS =
# **********************************************************************
# C++ Compiler and precompiler
-CXX = g++
+CXX = @CXX@
# Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
-CXXFLAGS := -Wall -O2
+ifeq ($(CXX),g++)
+ CXXFLAGS := -Wall -O2
+else
+ CXXFLAGS := @CXXFLAGS@
+endif
# Compiler flags to compile static objects
CXXFLAGS_STATIC := $(CXXFLAGS)
# Compiler flags for shared objects
@@ -49,13 +52,13 @@ CXXFLAGS_SHARED := $(CXXFLAGS) -fPIC
CXXCPP = $(CXX) -E -dD
# Preprocessor flags
-CPPFLAGS =
+CPPFLAGS = @CPPFLAGS@
# Command to run the compiler or preprocessor to produce dependencies
CXXDEP = $(CXX) -MM
# Linker flags
-LDFLAGS =
+LDFLAGS = @LDFLAGS@
# Linker flags to link applications
LDFLAGS_BIN = $(LDFLAGS)
# Linker flags used to link shared libraries
@@ -70,28 +73,32 @@ ARCHIVE_SUFFIX = .a
# **********************************************************************
# C Compiler
-CC = gcc
-CFLAGS = $(CXXFLAGS)
+CC = @CC@
+ifeq ($(CXX),g++)
+ CFLAGS := -Wall -O2
+else
+ CFLAGS := @CFLAGS@
+endif
# **********************************************************************
# Global includes, libraries and defines
INCS = -I. -I$(top_srcdir) -I$(incdir)
-LIBS = -L. -L$(libdir) -L/usr/local/lib
-DEFS =
+LIBS = -L. -L$(libdir) @LIBS@
+DEFS = @DEFS@
# **********************************************************************
# Functions
-HAVE_TIMEGM = 1
+HAVE_TIMEGM = @HAVE_TIMEGM@
# **********************************************************************
# Archive management
-RANLIB = ranlib
+RANLIB = @RANLIB@
AR = ar
ARFLAGS = rcuv
# **********************************************************************
# Installation programs
-INSTALL_EXE = $(top_srcdir)/install-sh
+INSTALL_EXE = @INSTALL@
INSTALL_PROGRAM = $(INSTALL_EXE) -c
INSTALL_DATA = $(INSTALL_EXE) -c -m 644
INSTALL_DIRS = $(top_srcdir)/mkinstalldirs
@@ -102,13 +109,13 @@ RM = @rm -vf
# **********************************************************************
# Directories
-prefix = ..
-exec_prefix = /usr/local
+prefix = @prefix@
+exec_prefix = @exec_prefix@
# Source directory
-srcdir = .
+srcdir = @srcdir@
# Installation directories
-bindir = ${exec_prefix}/bin
-incdir = ${exec_prefix}/include
-libdir = ${exec_prefix}/lib
+bindir = @bindir@
+incdir = @includedir@
+libdir = @libdir@
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..e9fd7ad
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,40 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT(Exiv2, 0.4, ahuggel at gmx.net)
+AC_CONFIG_SRCDIR([src/exif.cpp])
+AC_CONFIG_HEADER([config.h])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([malloc.h stdlib.h string.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_STAT
+AC_FUNC_STRFTIME
+AC_CHECK_FUNCS([memset strchr strerror strtol])
+AC_CHECK_FUNCS([timegm], HAVE_TIMEGM=1)
+AC_SUBST(HAVE_TIMEGM,$HAVE_TIMEGM)
+
+AC_CONFIG_FILES([config.mk])
+AC_OUTPUT
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list