FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > CentOS > CentOS

 
 
LinkBack Thread Tools
 
Old 02-09-2010, 08:31 PM
Chris Lumens
 
Default Be more explicit in which libraries we link with.

This is required by the latest build system's linker changes.
---
Makefile.am | 4 ++--
configure.ac | 4 +++-
loader/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6da7884..dee4e6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,8 +40,8 @@ dist_noinst_DATA = $(PACKAGE_NAME).spec
bin_PROGRAMS = mini-wm
dist_sbin_SCRIPTS = anaconda

-mini_wm_CFLAGS = $(GTK_X11_CFLAGS)
-mini_wm_LDFLAGS = $(GTK_X11_LIBS)
+mini_wm_CFLAGS = $(X11_CFLAGS) $(XCOMPOSITE_CFLAGS) $(GTK_X11_CFLAGS)
+mini_wm_LDFLAGS = $(X11_LIBS) $(XCOMPOSITE_LIBS) $(GTK_X11_LIBS)
mini_wm_SOURCES = mini-wm.c

udevdir = /lib/udev/rules.d
diff --git a/configure.ac b/configure.ac
index 46d3e3c..d56986d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,12 +128,14 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers or library)

# Check for libraries we need that provide pkg-config scripts
PKG_PROG_PKG_CONFIG([0.23])
+PKG_CHECK_MODULES([X11], [x11 >= 1.3])
+PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite >= 0.4.1])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.1])
PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-2.0 >= 2.16.1])
PKG_CHECK_MODULES([GDK], [gdk-2.0 >= 2.16.1])
PKG_CHECK_MODULES([NETWORKMANAGER], [NetworkManager >= 0.7.1])
PKG_CHECK_MODULES([LIBNL], [libnl-1 >= 1.0])
-PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib >= 0.7.1])
+PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib >= 0.7.1 libnm-util >= 0.7.1])
PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.17])
PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.19.5])
PKG_CHECK_MODULES([RPM], [rpm >= 4.8.0])
diff --git a/loader/Makefile.am b/loader/Makefile.am
index b37057c..cfb7c7b 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -45,7 +45,7 @@ loader_CFLAGS = $(COMMON_CFLAGS) $(GLIB_CFLAGS) $(LIBNM_GLIB_CFLAGS)
loader_LDADD = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS)
$(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS)
$(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS)
- $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la
+ $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm
loader_SOURCES = loader.c copy.c log.c moduleinfo.c loadermisc.c
modules.c windows.c lang.c kbd.c driverdisk.c
selinux.c mediacheck.c kickstart.c driverselect.c
--
1.6.5.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 02-10-2010, 07:33 AM
Hans de Goede
 
Default Be more explicit in which libraries we link with.

Ack.

On 02/09/2010 10:31 PM, Chris Lumens wrote:

This is required by the latest build system's linker changes.
---
Makefile.am | 4 ++--
configure.ac | 4 +++-
loader/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6da7884..dee4e6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,8 +40,8 @@ dist_noinst_DATA = $(PACKAGE_NAME).spec
bin_PROGRAMS = mini-wm
dist_sbin_SCRIPTS = anaconda

-mini_wm_CFLAGS = $(GTK_X11_CFLAGS)
-mini_wm_LDFLAGS = $(GTK_X11_LIBS)
+mini_wm_CFLAGS = $(X11_CFLAGS) $(XCOMPOSITE_CFLAGS) $(GTK_X11_CFLAGS)
+mini_wm_LDFLAGS = $(X11_LIBS) $(XCOMPOSITE_LIBS) $(GTK_X11_LIBS)
mini_wm_SOURCES = mini-wm.c

udevdir = /lib/udev/rules.d
diff --git a/configure.ac b/configure.ac
index 46d3e3c..d56986d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,12 +128,14 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers or library)

# Check for libraries we need that provide pkg-config scripts
PKG_PROG_PKG_CONFIG([0.23])
+PKG_CHECK_MODULES([X11], [x11>= 1.3])
+PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite>= 0.4.1])
PKG_CHECK_MODULES([GLIB], [glib-2.0>= 2.16.1])
PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-2.0>= 2.16.1])
PKG_CHECK_MODULES([GDK], [gdk-2.0>= 2.16.1])
PKG_CHECK_MODULES([NETWORKMANAGER], [NetworkManager>= 0.7.1])
PKG_CHECK_MODULES([LIBNL], [libnl-1>= 1.0])
-PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib>= 0.7.1])
+PKG_CHECK_MODULES([LIBNM_GLIB], [libnm-glib>= 0.7.1 libnm-util>= 0.7.1])
PKG_CHECK_MODULES([DEVMAPPER], [devmapper>= 1.02.17])
PKG_CHECK_MODULES([LIBCURL], [libcurl>= 7.19.5])
PKG_CHECK_MODULES([RPM], [rpm>= 4.8.0])
diff --git a/loader/Makefile.am b/loader/Makefile.am
index b37057c..cfb7c7b 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -45,7 +45,7 @@ loader_CFLAGS = $(COMMON_CFLAGS) $(GLIB_CFLAGS) $(LIBNM_GLIB_CFLAGS)
loader_LDADD = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS)
$(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS)
$(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS)
- $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la
+ $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm
loader_SOURCES = loader.c copy.c log.c moduleinfo.c loadermisc.c
modules.c windows.c lang.c kbd.c driverdisk.c
selinux.c mediacheck.c kickstart.c driverselect.c


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 08:51 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org