poldek i autoconf 2.53
Artur Frysiak
wiget w pld.org.pl
Śro, 17 Kwi 2002, 15:56:38 CEST
Aby przegenerować configure w poldku trzeba trochę poprawić
configure.in. Dokładniej mówiąc trzeba wstawić [] tam gdzie tego
brakuje.
Łatka w załączniku
--
Artur Frysiak
http://www.pld.org.pl/
-------------- następna część ---------
Index: configure.in
===================================================================
RCS file: /cvsroot/installer/poldek/configure.in,v
retrieving revision 1.55
diff -u -r1.55 configure.in
--- configure.in 14 Apr 2002 23:34:37 -0000 1.55
+++ configure.in 17 Apr 2002 13:50:58 -0000
@@ -29,11 +29,11 @@
AC_CHECK_PROG(POD2MAN, pod2man, pod2man)
dnl Process features.
-AC_CHECK_LIB(tinfo, tigetstr,,
- AC_CHECK_LIB(ncurses, tigetstr, , AC_MSG_ERROR("tinfo nor ncurses not found")))
+AC_CHECK_LIB(tinfo, tigetstr,,[
+ AC_CHECK_LIB(ncurses, tigetstr, ,[ AC_MSG_ERROR(["tinfo nor ncurses not found"])])])
-AC_CHECK_HEADERS(ncurses/curses.h, CPPFLAGS="-I/usr/include/ncurses $CPPFLAGS",
- AC_CHECK_HEADERS(curses.h,, AC_MSG_ERROR("curses.h not found"), ), )
+AC_CHECK_HEADERS(ncurses/curses.h,[ CPPFLAGS="-I/usr/include/ncurses $CPPFLAGS"],[
+ AC_CHECK_HEADERS(curses.h,, [AC_MSG_ERROR(["curses.h not found"])], )], )
AC_ARG_ENABLE(imode,
[ --disable-imode turn off interactive mode],
@@ -42,11 +42,11 @@
if test "${INTERACTIVE_MODE}." != "yes."; then
AM_CONDITIONAL(ENABLE_INTERACTIVE_MODE, false)
else
- AC_CHECK_LIB(readline, readline,, AC_MSG_ERROR("readline not found"))
- AC_CHECK_LIB(pcre, pcre_compile,, AC_MSG_ERROR("pcre not found"))
- AC_CHECK_HEADERS(pcre.h,,
+ AC_CHECK_LIB(readline, readline,,[ AC_MSG_ERROR(["readline not found"])])
+ AC_CHECK_LIB(pcre, pcre_compile,,[ AC_MSG_ERROR(["pcre not found"])])
+ AC_CHECK_HEADERS(pcre.h,,[
AC_CHECK_HEADERS(pcre/pcre.h,
- CPPFLAGS="-I/usr/include/pcre $CPPFLAGS", ), )
+ [CPPFLAGS="-I/usr/include/pcre $CPPFLAGS"], )], )
AM_CONDITIONAL(ENABLE_INTERACTIVE_MODE, true)
AC_DEFINE(ENABLE_INTERACTIVE_MODE)
@@ -64,7 +64,7 @@
if test "${ENABLE_VFILE_CURL}." != "yes."; then
AM_CONDITIONAL(ENABLE_VFILE_CURL, false)
else
- AC_CHECK_LIB(curl, curl_easy_init,,AC_MSG_ERROR("libcurl not found"))
+ AC_CHECK_LIB(curl, curl_easy_init,,AC_MSG_ERROR(["libcurl not found"]))
AM_CONDITIONAL(ENABLE_VFILE_CURL, true)
AC_DEFINE(ENABLE_VFILE_CURL)
fi
@@ -115,9 +115,9 @@
AC_CHECK_MEMBER(struct tm.tm_gmtoff,
- AC_DEFINE(HAVE_TM_GMTOFF),
- AC_CHECK_MEMBER(struct tm.__tm_gmtoff, AC_DEFINE(HAVE_TM___GMTOFF)
- ,,[#include <time.h>]),
+ [AC_DEFINE(HAVE_TM_GMTOFF)],
+ [AC_CHECK_MEMBER(struct tm.__tm_gmtoff,[ AC_DEFINE(HAVE_TM___GMTOFF)]
+ ,,[#include <time.h>])],
[#include <time.h>])
@@ -138,15 +138,15 @@
AC_CHECK_HEADERS(fcntl.h limits.h malloc.h)
AC_CHECK_HEADERS(sys/file.h sys/time.h syslog.h unistd.h)
-AC_CHECK_HEADER(stdint.h,,AC_MSG_ERROR("C9X compiler is needed by $PACKAGE"))
-AC_CHECK_HEADER(obstack.h,,AC_MSG_ERROR("obstacks are needed by $PACKAGE"))
-AC_CHECK_HEADER(argp.h,,AC_MSG_ERROR("missing required argp.h"))
+AC_CHECK_HEADER(stdint.h,,AC_MSG_ERROR(["C9X compiler is needed by $PACKAGE"]))
+AC_CHECK_HEADER(obstack.h,,AC_MSG_ERROR(["obstacks are needed by $PACKAGE"]))
+AC_CHECK_HEADER(argp.h,,AC_MSG_ERROR(["missing required argp.h"]))
dnl RH rpm needs this
CPPFLAGS="-I/usr/include/rpm $CPPFLAGS"
-AC_CHECK_HEADER(rpm/rpmlib.h,,AC_MSG_ERROR("missing required rpmlib.h"))
+AC_CHECK_HEADER(rpm/rpmlib.h,,AC_MSG_ERROR(["missing required rpmlib.h"]))
-AC_MSG_CHECKING(for rpm 4.x)
+AC_MSG_CHECKING([for rpm 4.x])
#RPMDBI_PACKAGES
AC_EGREP_CPP(yes,
[#include <rpm/rpmlib.h>
@@ -165,7 +165,7 @@
AC_DEFINE(HAVE_RPM_EXTDEPS)
fi
- AC_MSG_CHECKING(for rpm 4.0.4)
+ AC_MSG_CHECKING([for rpm 4.0.4])
AC_EGREP_CPP(RPMSENSE_KEYRING,
[ #include <rpm/rpmcli.h>
], is_rpm4_0_4=yes, is_rpm4_0_4=no)
@@ -252,21 +252,21 @@
fi
if test ${is_rpm4}. = yes. ; then
- AC_CHECK_LIB(rpmio, rpmCleanPath,,AC_MSG_ERROR("rpmio not found"))
+ AC_CHECK_LIB(rpmio, rpmCleanPath,,AC_MSG_ERROR(["rpmio not found"]))
fi
AC_CHECK_LIB(rpm, rpmReadPackageInfo,[LIBS="$LIBS -lrpm $DBLIB"],
AC_CHECK_LIB(rpm, rpmReadPackageHeader,[LIBS="$LIBS -lrpm -lrpmdb $DBLIB"],
- AC_MSG_ERROR("rpmlib not found"),
+ AC_MSG_ERROR(["rpmlib not found"]),
[$DBLIB -lrpmdb]),
[$DBLIB])
-AC_CHECK_FUNCS(rpmMachineScore,, AC_MSG_ERROR("rpmlib not found"))
+AC_CHECK_FUNCS(rpmMachineScore,,[ AC_MSG_ERROR(["rpmlib not found"])])
AC_CHECK_FUNCS(rpmlog, [AC_DEFINE(HAVE_RPMLOG)])
AC_CHECK_FUNCS(rpmCheckSig, [AC_DEFINE(HAVE_RPMCHECKSIG)])
-AC_CHECK_HEADERS(db_185.h,, AC_MSG_WARN("disabled synchronization with db file-dependencies"))
+AC_CHECK_HEADERS(db_185.h,,[ AC_MSG_WARN(["disabled synchronization with db file-dependencies"])])
AC_CHECK_FUNCS(__db185_open)
dnl 4.0.4 has cross dependenecies(?)
if test ${is_rpm4_0_4}. = yes. -a ${ENABLE_STATIC}. = yes. ; then
@@ -276,29 +276,31 @@
LIBS="$LIBS -lbz2 -lrpmio"
fi
-AC_CHECK_FUNCS(getline,, AC_MSG_ERROR("getline\(\) is needed by $PACKAGE"),
+AC_CHECK_FUNCS(getline,, [AC_MSG_ERROR(["getline\(\) is needed by $PACKAGE"])],
$CONF_IN_LDFLAGS)
-AC_CHECK_FUNCS(fopencookie,, AC_MSG_WARN("disabled gzipped files support"),
+AC_CHECK_FUNCS(fopencookie,, [AC_MSG_WARN(["disabled gzipped files support"])],
$CONF_IN_LDFLAGS)
AC_CHECK_FUNCS(openpty,,
AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"]))
AC_CHECK_FUNCS(rpmGetRpmlibProvides,,
-AC_MSG_WARN("poldek will not work fine with rpmlib\(...\) capabilities"),
-$CONF_IN_LDFLAGS)
+ [AC_MSG_WARN("[poldek will not work fine with rpmlib\(...\) capabilities"])],
+ [$CONF_IN_LDFLAGS])
AC_CHECK_FUNCS(EVP_DigestInit,,
- AC_CHECK_LIB(crypto, EVP_DigestInit,,
- AC_MSG_ERROR("libcryto is needed by $PACKAGE")), $CONF_IN_LDFLAGS)
+ [AC_CHECK_LIB(crypto, EVP_DigestInit,,
+ [AC_MSG_ERROR(["libcryto is needed by $PACKAGE"])]
+ )],
+ [$CONF_IN_LDFLAGS])
dnl trullib 0.43.5 has n_hash_size; test if linked with system copy only
if test -z "$TRURL_DIR"; then
AC_CHECK_LIB(trurl, n_hash_size,,
- AC_MSG_ERROR("trurlib >= 0.43.5 not found"), $CONF_IN_LDFLAGS)
+ [AC_MSG_ERROR(["trurlib >= 0.43.5 not found"])], [$CONF_IN_LDFLAGS])
else
LIBS="$LIBS -ltrurl"
fi
@@ -306,7 +308,7 @@
AC_OUTPUT([
shell/Makefile
- vfile/Makefile
+ vfile/Makefile
vfile/vftp/Makefile
vfile/vhttp/Makefile
Makefile
Więcej informacji o liście dyskusyjnej pld-installer