Index: ossp-pkg/lmtp2nntp/configure.ac
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/configure.ac,v
rcsdiff -q -kk '-r1.36' '-r1.37' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/configure.ac,v' 2>/dev/null
--- configure.ac	2005/10/09 21:28:07	1.36
+++ configure.ac	2005/10/22 10:34:04	1.37
@@ -56,9 +56,9 @@
                 ex, __ex_ctx, ex.h,
                 [SUBDIR_EX=""],
                 [SUBDIR_EX="lib_ex"
-                 CPPFLAGS="$CPPFLAGS -Ilib_ex"
-                 CFLAGS="$CFLAGS -Ilib_ex"
-                 LDFLAGS="$LDFLAGS -Llib_ex/.libs"
+                 CPPFLAGS="-Ilib_ex $CPPFLAGS"
+                 CFLAGS="-Ilib_ex $CFLAGS"
+                 LDFLAGS="-Llib_ex/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lex"])
 AC_SUBST(SUBDIR_EX)
 
@@ -67,9 +67,9 @@
                 str, str_parse, str.h,
                 [SUBDIR_STR=""],
                 [SUBDIR_STR="lib_str"
-                 CPPFLAGS="$CPPFLAGS -Ilib_str"
-                 CFLAGS="$CFLAGS -Ilib_str"
-                 LDFLAGS="$LDFLAGS -Llib_str/.libs"
+                 CPPFLAGS="-Ilib_str $CPPFLAGS"
+                 CFLAGS="-Ilib_str $CFLAGS"
+                 LDFLAGS="-Llib_str/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lstr"])
 AC_SUBST(SUBDIR_STR)
 
@@ -78,9 +78,9 @@
                 l2, l2_stream_log, l2.h,
                 [SUBDIR_L2=""],
                 [SUBDIR_L2="lib_l2"
-                 CPPFLAGS="$CPPFLAGS -Ilib_l2"
-                 CFLAGS="$CFLAGS -Ilib_l2"
-                 LDFLAGS="$LDFLAGS -Llib_l2/.libs"
+                 CPPFLAGS="-Ilib_l2 $CPPFLAGS"
+                 CFLAGS="-Ilib_l2 $CFLAGS"
+                 LDFLAGS="-Llib_l2/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -ll2"])
 AC_SUBST(SUBDIR_L2)
 
@@ -89,9 +89,9 @@
                 sa, sa_create, sa.h,
                 [SUBDIR_SA=""],
                 [SUBDIR_SA="lib_sa"
-                 CPPFLAGS="$CPPFLAGS -Ilib_sa"
-                 CFLAGS="$CFLAGS -Ilib_sa"
-                 LDFLAGS="$LDFLAGS -Llib_sa/.libs"
+                 CPPFLAGS="-Ilib_sa $CPPFLAGS"
+                 CFLAGS="-Ilib_sa $CFLAGS"
+                 LDFLAGS="-Llib_sa/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lsa"])
 AC_SUBST(SUBDIR_SA)
 
@@ -100,9 +100,9 @@
                 var, var_expand, var.h,
                 [SUBDIR_VAR=""],
                 [SUBDIR_VAR="lib_var"
-                 CPPFLAGS="$CPPFLAGS -Ilib_var"
-                 CFLAGS="$CFLAGS -Ilib_var"
-                 LDFLAGS="$LDFLAGS -Llib_var/.libs"
+                 CPPFLAGS="-Ilib_var $CPPFLAGS"
+                 CFLAGS="-Ilib_var $CFLAGS"
+                 LDFLAGS="-Llib_var/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lvar"])
 AC_SUBST(SUBDIR_VAR)
 
@@ -111,9 +111,9 @@
                 val, val_create, val.h,
                 [SUBDIR_VAL=""],
                 [SUBDIR_VAL="lib_val"
-                 CPPFLAGS="$CPPFLAGS -Ilib_val"
-                 CFLAGS="$CFLAGS -Ilib_val"
-                 LDFLAGS="$LDFLAGS -Llib_val/.libs"
+                 CPPFLAGS="-Ilib_val $CPPFLAGS"
+                 CFLAGS="-Ilib_val $CFLAGS"
+                 LDFLAGS="-Llib_val/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lval"])
 AC_SUBST(SUBDIR_VAL)
 
@@ -122,9 +122,9 @@
                 popt, popt_getcontext, popt.h,
                 [SUBDIR_POPT=""],
                 [SUBDIR_POPT="lib_popt"
-                 CPPFLAGS="$CPPFLAGS -Ilib_popt"
-                 CFLAGS="$CFLAGS -Ilib_popt"
-                 LDFLAGS="$LDFLAGS -Llib_popt/.libs"
+                 CPPFLAGS="-Ilib_popt $CPPFLAGS"
+                 CFLAGS="-Ilib_popt $CFLAGS"
+                 LDFLAGS="-Llib_popt/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lpopt"])
 AC_SUBST(SUBDIR_POPT)
 
@@ -133,9 +133,9 @@
                 pcre, pcre_compile, pcre.h,
                 [SUBDIR_PCRE=""],
                 [SUBDIR_PCRE="lib_pcre"
-                 CPPFLAGS="$CPPFLAGS -Ilib_pcre"
-                 CFLAGS="$CFLAGS -Ilib_pcre"
-                 LDFLAGS="$LDFLAGS -Llib_pcre/.libs"
+                 CPPFLAGS="-Ilib_pcre $CPPFLAGS"
+                 CFLAGS="-Ilib_pcre $CFLAGS"
+                 LDFLAGS="-Llib_pcre/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lpcre"])
 AC_SUBST(SUBDIR_PCRE)