diff options
| author | Bill Nottingham <notting@redhat.com> | 2003-01-14 02:33:32 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2003-01-14 02:33:32 +0000 |
| commit | f6ba643145c69dc4b9d6233825276b94fc81597a (patch) | |
| tree | 300a8898b734e456edd9a0181f32b643c19a4e5e | |
| parent | 5eb109e193830a95d353593be0b69efe2e910cc4 (diff) | |
| download | initscripts-f6ba643145c69dc4b9d6233825276b94fc81597a.tar initscripts-f6ba643145c69dc4b9d6233825276b94fc81597a.tar.gz initscripts-f6ba643145c69dc4b9d6233825276b94fc81597a.tar.bz2 initscripts-f6ba643145c69dc4b9d6233825276b94fc81597a.tar.xz initscripts-f6ba643145c69dc4b9d6233825276b94fc81597a.zip | |
use glib2 instead of glib (#78690, <kisch@mindless.com>)
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | src/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index e845a9a4..0683df4e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -20,7 +20,7 @@ Conflicts: kernel <= 2.4.11, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Obsoletes: rhsound sapinit Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils -BuildPrereq: glib-devel popt gettext +BuildPrereq: glib2-devel popt gettext pkgconfig %description The initscripts package contains the basic system scripts used to boot diff --git a/src/Makefile b/src/Makefile index a99a7ee2..78039b5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -55,11 +55,11 @@ usleep: $(USLEEP_OBJS) $(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic ppp-watch: $(PPPWATCH_OBJS) - $(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) -Wl,-Bstatic -lglib -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) -Wl,-Bstatic `pkg-config glib-2.0 --libs` -Wl,-Bdynamic shvar.o: shvar.c - $(CC) $(CFLAGS) `glib-config --cflags` -c shvar.c -o shvar.o + $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c shvar.c -o shvar.o ppp-watch.o: ppp-watch.c - $(CC) $(CFLAGS) `glib-config --cflags` -c ppp-watch.c -o ppp-watch.o + $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c ppp-watch.c -o ppp-watch.o |