RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 12-Aug-2009 16:29:40
Branch: HEAD Handle: 2009081214293900
Modified files:
popt Makefile.am configure.ac
Log:
Probably it is better to restrict the previous fix only for Linux
systems.
Summary:
Revision Changes Path
1.54 +1 -1 popt/Makefile.am
1.50 +21 -7 popt/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/Makefile.am
============================================================================
$ cvs diff -u -r1.53 -r1.54 Makefile.am
--- popt/Makefile.am 12 Aug 2009 13:15:21 -0000 1.53
+++ popt/Makefile.am 12 Aug 2009 14:29:39 -0000 1.54
@@ -4,7 +4,7 @@
LINT = splint
-EXTRA_DIST = config.rpath config.rpath autogen.sh CHANGES $(man_MANS)
popt.spec \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
footer_no_timestamp.html libpopt.vers \
testit.sh test-poptrc test3-data/0* \
po/*.in po/*.po po/popt.pot \
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
============================================================================
$ cvs diff -u -r1.49 -r1.50 configure.ac
--- popt/configure.ac 12 Aug 2009 13:15:21 -0000 1.49
+++ popt/configure.ac 12 Aug 2009 14:29:39 -0000 1.50
@@ -82,13 +82,27 @@
# - Don't require a not upstream patch to pkgconfig
# (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
popt_pkgconfig_libs='-L${libdir} -lpopt'
-case "${libdir}" in
- /usr/lib|/usr/lib64|/lib|/lib64)
- popt_pkgconfig_libs='-lpopt'
- ;;
- *)
- popt_pkgconfig_libs='-L${libdir} -lpopt'
- ;;
+case "${host}" in
+ *-*-linux*)
+ case "${libdir}" in
+ /usr/lib|/usr/lib64|/lib|/lib64)
+ popt_pkgconfig_libs='-lpopt'
+ ;;
+ *)
+ popt_pkgconfig_libs='-L${libdir} -lpopt'
+ ;;
+ esac
+ ;;
+ *-*-gnu*)
+ case "${libdir}" in
+ /usr/lib|/usr/lib64|/lib|/lib64)
+ popt_pkgconfig_libs='-lpopt'
+ ;;
+ *)
+ popt_pkgconfig_libs='-L${libdir} -lpopt'
+ ;;
+ esac
+ ;;
esac
AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
