add config.h defines for scripts like find-requires.

CVS patchset: 2462
CVS date: 1998/10/15 16:34:51

CHANGES

@@ -1,4 +1,5 @@
 2.5.5 -> 2.90
+	- add config.h defines for scripts like find-requires.
 	- add readRPM to libbuild, headerGetLangs to librpm.
 	- permit rpm to be built in a sub-directory (--srcdir=DIR).
 	- configure using automake.

Makefile.in

@@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
+FINDPROVIDES = @FINDPROVIDES@
+FINDREQUIRES = @FINDREQUIRES@
 FIXPERMS = @FIXPERMS@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
@@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@
 LIBDL = @LIBDL@
 LIBMISC = @LIBMISC@
 LIBOBJS = @LIBOBJS@
+LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
+LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
 LIBS = @LIBS@
 LN_S = @LN_S@
+MACROFILES = @MACROFILES@
 MAKEINFO = @MAKEINFO@
 MISCDIR = @MISCDIR@
 MISCPATH = @MISCPATH@

acconfig.h

@@ -87,9 +87,27 @@
    directory and all necessary parent directories, ala `mkdir -p'        */
 #undef MKDIR_P
 
-/* define this to be whatever root's primary group is, in double quotes */
+/* Define this to be whatever root's primary group is, in double quotes */
 #undef ROOT_GROUP
 
+/* Full path to rpm configuration directory (usually /usr/lib/rpm) */
+#undef RPMCONFIGDIR
+
+/* Full path to find-provides script (usually /usr/lib/rpm/find-provides) */
+#undef FINDPROVIDES
+
+/* Full path to find-requires script (usually /usr/lib/rpm/find-requires) */
+#undef FINDREQUIRES
+
+/* Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt) */
+#undef LIBRPMALIAS_FILENAME
+
+/* Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc) */
+#undef LIBRPMRC_FILENAME
+
+/* Full path to macros configuration file (usually /usr/lib/rpm/macros) */
+#undef MACROFILES
+
 ^L
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

configure.in

@@ -20,8 +20,6 @@ LIBOBJS=
 
 dnl YYY AC_CANONICAL_SYSTEM
 
-RPMCONFIGDIR='$(libdir)/rpm'
-
 dnl Checks for programs.
 AC_PROG_CC
 if test "$ac_cv_prog_gcc" = yes; then
@@ -583,6 +581,25 @@ if test -n "$LIBOBJS" ; then
 	MISCPATH=misc/libmisc.a
 fi
 
+RPMCONFIGDIR="`echo ${prefix}/lib/rpm`"
+AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR")
+AC_SUBST(RPMCONFIGDIR)
+LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
+AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME")
+AC_SUBST(LIBRPMRC_FILENAME)
+LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
+AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME")
+AC_SUBST(LIBRPMALIAS_FILENAME)
+FINDREQUIRES="${RPMCONFIGDIR}/find-requires"
+AC_DEFINE_UNQUOTED(FINDREQUIRES, "$FINDREQUIRES")
+AC_SUBST(FINDREQUIRES)
+FINDPROVIDES="${RPMCONFIGDIR}/find-provides"
+AC_DEFINE_UNQUOTED(FINDPROVIDES, "$FINDPROVIDES")
+AC_SUBST(FINDPROVIDES)
+MACROFILES="${RPMCONFIGDIR}/macros"
+AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES")
+AC_SUBST(MACROFILES)
+
 AC_SUBST(LIBOBJS)
 AC_SUBST(INCPATH)
 
@@ -599,7 +616,6 @@ AC_SUBST(FIXPERMS)
 AC_SUBST(MISCDIR)
 AC_SUBST(LIBMISC)
 AC_SUBST(MISCPATH)
-AC_SUBST(RPMCONFIGDIR)
 AC_SUBST(MKDIR_P)
 AC_SUBST(LDFLAGS_STATIC)