[netperf-dev] netperf4 commit notice r118 - branches/glib_migration

[raj at netperf.org]

Author: raj
Date: 2006-03-30 16:32:51 -0800 (Thu, 30 Mar 2006)
New Revision: 118

Modified:
   branches/glib_migration/configure
   branches/glib_migration/configure.ac
Log:
Fix some of the cleanup so we actually get the -L options we need on
HP-UX.  I notice that under Linux with GCC, for gmodule-2.0 there is a
-Wl,--export-dynamic we don't pick-up.  Not sure yet if that is a problem.


Modified: branches/glib_migration/configure
===================================================================
--- branches/glib_migration/configure	2006-03-30 23:37:50 UTC (rev 117)
+++ branches/glib_migration/configure	2006-03-31 00:32:51 UTC (rev 118)
@@ -22591,7 +22591,8 @@
 fi;
 
 pkg_config_cflags=""
-pkg_config_libs=""
+pkg_config_libs_l=""
+pkg_config_libs_L=""
 
 
 
@@ -22701,8 +22702,10 @@
 
     pkg_config_cflags=`$PKG_CONFIG --cflags-only-I \
 			libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
-    pkg_config_libs=`$PKG_CONFIG --libs-only-l --libs-only-L \
+    pkg_config_libs_L=`$PKG_CONFIG  --libs-only-L \
 			libxml-2.0 glib-2.0 gmodule-2.0  gthread-2.0`
+    pkg_config_libs_l=`$PKG_CONFIG  --libs-only-l \
+			libxml-2.0 glib-2.0 gmodule-2.0  gthread-2.0`
 
 # see if we should be enabling histogram support
 
@@ -24137,12 +24140,12 @@
 
 case $GCC in
      yes)
-         CFLAGS="$CFLAGS -pthread $libxml2_cflags $pkg_config_cflags"
-	 LIBS="$LIBS -pthread $libxml2_libs $pkg_config_libs"
+         CFLAGS="$CFLAGS -pthread $pkg_config_cflags"
+	 LIBS="$LIBS -pthread $pkg_config_libs_L $pkg_config_libs_l"
 	 ;;
        *)
-         CFLAGS="$CLFAGS $libxml2_cflags $pkg_config_cflags "
-	 LIBS="$LIBS $libxml2_libs $pkg_config_libs "
+         CFLAGS="$CLFAGS $pkg_config_cflags "
+	 LIBS="$LIBS $pkg_config_libs_L $pkg_config_libs_l "
 	 ;;
 esac
 

Modified: branches/glib_migration/configure.ac
===================================================================
--- branches/glib_migration/configure.ac	2006-03-30 23:37:50 UTC (rev 117)
+++ branches/glib_migration/configure.ac	2006-03-31 00:32:51 UTC (rev 118)
@@ -124,14 +124,17 @@
 	[in the future will show where/how to include glib])])
 
 pkg_config_cflags=""
-pkg_config_libs=""
+pkg_config_libs_l=""
+pkg_config_libs_L=""
 
     PKG_PROG_PKG_CONFIG()
 
     pkg_config_cflags=`$PKG_CONFIG --cflags-only-I \
 			libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
-    pkg_config_libs=`$PKG_CONFIG --libs-only-l --libs-only-L \
+    pkg_config_libs_L=`$PKG_CONFIG  --libs-only-L \
 			libxml-2.0 glib-2.0 gmodule-2.0  gthread-2.0`
+    pkg_config_libs_l=`$PKG_CONFIG  --libs-only-l \
+			libxml-2.0 glib-2.0 gmodule-2.0  gthread-2.0`
 
 # see if we should be enabling histogram support
 
@@ -596,12 +599,12 @@
 
 case $GCC in
      yes)
-         CFLAGS="$CFLAGS -pthread $libxml2_cflags $pkg_config_cflags"
-	 LIBS="$LIBS -pthread $libxml2_libs $pkg_config_libs"
+         CFLAGS="$CFLAGS -pthread $pkg_config_cflags"
+	 LIBS="$LIBS -pthread $pkg_config_libs_L $pkg_config_libs_l"
 	 ;;
        *)
-         CFLAGS="$CLFAGS $libxml2_cflags $pkg_config_cflags "
-	 LIBS="$LIBS $libxml2_libs $pkg_config_libs "
+         CFLAGS="$CLFAGS $pkg_config_cflags "
+	 LIBS="$LIBS $pkg_config_libs_L $pkg_config_libs_l "
 	 ;;
 esac