diff --git a/configure b/configure index 2d074a23c400163f6cc0ffcc238bef09178f739b..287cc8deb1164e03b72a6a67d2c320495a519ec2 100755 --- a/configure +++ b/configure @@ -24496,15 +24496,14 @@ echo "$as_me: WARNING: *** pkg-config not found. Cannot probe for libglade-2.0 o ac_have_gtk="no" fi -### Check for libglade package - if test "$ac_have_gtk" == "yes"; then - $HAVEPKGCONFIG --exists libglade-2.0 - if ! test $? -eq 0 ; then - { echo "$as_me:$LINENO: WARNING: *** libbglade-2.0 is not available." >&5 -echo "$as_me: WARNING: *** libbglade-2.0 is not available." >&2;} - ac_have_gtk="no" - fi - fi +### Check for libglade package (We don't need this right now so don't add it) +# if test "$ac_have_gtk" == "yes"; then +# $HAVEPKGCONFIG --exists libglade-2.0 +# if ! test $? -eq 0 ; then +# AC_MSG_WARN([*** libbglade-2.0 is not available.]) +# ac_have_gtk="no" +# fi +# fi ### Check for gtk2.6 package @@ -24532,11 +24531,13 @@ echo "$as_me: WARNING: *** gtk+-$gtk_config_major_version.$gtk_config_minor_vers ### Run a test program if test "$ac_have_gtk" == "yes" ; then - GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0` - GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0` - if test ! -z "GLADE_STATIC" ; then - GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"` - fi + # GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0` + GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags gtk+-2.0 gthread-2.0` +# GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0` + GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0` +# if test ! -z "GLADE_STATIC" ; then +# GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"` +# fi save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$GTK2_CFLAGS $save_CFLAGS" diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in index eba9f8752b065cf0293658dc0515ba161f68606a..852c72c9859b8583e389c40b096b88268e789c15 100644 --- a/src/plugins/select/cons_res/Makefile.in +++ b/src/plugins/select/cons_res/Makefile.in @@ -280,7 +280,9 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = select_cons_res.la # Consumable resources node selection plugin. -select_cons_res_la_SOURCES = select_cons_res.c select_cons_res.h dist_tasks.c dist_tasks.h +select_cons_res_la_SOURCES = select_cons_res.c select_cons_res.h \ + dist_tasks.c dist_tasks.h + select_cons_res_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) select_cons_res_la_LIBADD = $(top_builddir)/src/common/libcommon.la all: all-am @@ -352,6 +354,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dist_tasks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select_cons_res.Plo@am__quote@ .c.o: diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in index 0f924784eaaa37d7ef8b5f1ed14e73dc5a9e935e..48aed618c9fdf61f1c7ab74da57835eec74adabd 100644 --- a/src/plugins/task/affinity/Makefile.in +++ b/src/plugins/task/affinity/Makefile.in @@ -306,7 +306,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common @HAVE_SCHED_SETAFFINITY_FALSE@ schedutils.c \ @HAVE_SCHED_SETAFFINITY_FALSE@ task_affinity.c -task_affinity_la_LIBADD = $(top_builddir)/src/common/libcommon.la all: all-am .SUFFIXES: