summaryrefslogtreecommitdiff
path: root/popt
diff options
context:
space:
mode:
authorewt <devnull@localhost>1998-02-11 08:59:34 +0000
committerewt <devnull@localhost>1998-02-11 08:59:34 +0000
commit7388abf88b2f181dee5c17f3a4282eaadb3444d3 (patch)
tree1baa020f7d36d24e2d39e26441609a440a2c36d0 /popt
parentc8be333089ae5c1d8d523a0cce332f34293ef02c (diff)
downloadlibrpm-tizen-7388abf88b2f181dee5c17f3a4282eaadb3444d3.tar.gz
librpm-tizen-7388abf88b2f181dee5c17f3a4282eaadb3444d3.tar.bz2
librpm-tizen-7388abf88b2f181dee5c17f3a4282eaadb3444d3.zip
1) added changes which let RPM build in a directory other then its source
directory 2) moved popt to autoconf CVS patchset: 2005 CVS date: 1998/02/11 08:59:34
Diffstat (limited to 'popt')
-rw-r--r--popt/Makefile.in (renamed from popt/Makefile)15
-rwxr-xr-xpopt/configure.in8
2 files changed, 14 insertions, 9 deletions
diff --git a/popt/Makefile b/popt/Makefile.in
index b76b25e1d..a44efdec4 100644
--- a/popt/Makefile
+++ b/popt/Makefile.in
@@ -1,21 +1,18 @@
+srcdir = @srcdir@
+VPATH = $(srcdir)
+
LIBOBJECTS = popt.o
-DEFCFLAGS=-O2 -Wall
+WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-SOURCES =$(subst .o,.c,$(LIBOBJECTS))
+SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
LIBPOPT = libpopt.a
LIBS=/usr/lib
INCLUDE=/usr/include
-ifeq (../Makefile.inc,$(wildcard ../Makefile.inc))
-include ../Makefile.inc
-endif
-
# -----------------------------------------------------------------------
-ifeq ($(CFLAGS),)
-CFLAGS=$(DEFCFLAGS)
-endif
+CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS)
ifeq ($(RANLIB),)
RANLIB=ranlib
diff --git a/popt/configure.in b/popt/configure.in
new file mode 100755
index 000000000..0b6122593
--- /dev/null
+++ b/popt/configure.in
@@ -0,0 +1,8 @@
+AC_INIT(popt.h)
+
+AC_PROG_CC
+AC_GCC_TRADITIONAL
+
+AC_CHECK_FUNCS(mmap)
+
+AC_OUTPUT(Makefile)