X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=m17n-config.in;h=a1fc0e0cc7f33a5a181e08d8e85e98e42b681bc6;hb=6ac495c3a791ab71a4fb0a19b2d9f88f77efb558;hp=4a58e06c9e76ac02e3729bd1500fc4243e6d0f4d;hpb=e086980f1150accd9f74ebe728939ad66a6e8a57;p=m17n%2Fm17n-lib.git

diff --git a/m17n-config.in b/m17n-config.in
index 4a58e06..a1fc0e0 100644
--- a/m17n-config.in
+++ b/m17n-config.in
@@ -18,12 +18,10 @@ if test $# -eq 0; then
   exit 0
 fi
 
-LIBNAME=m17n
-
 case $1 in
-CORE) LIBNAME=m17n-core; shift;;
-GUI) LIBNAME=m17n-gui; shift;;
-X) LIBNAME=m17n-gui; shift;;
+CORE) LIBNAME="-lm17n-core"; LIBTOOLNAME="m17n-core"; shift;;
+GUI|X) LIBNAME="-lm17n-core -lm17n -lm17n-gui"; LIBTOOLNAME="m17n-gui"; shift;;
+*) LIBNAME="-lm17n-core -lm17n"; LIBTOOLNAME="m17n"; ;;
 esac
 
 case $1 in
@@ -32,9 +30,9 @@ case $1 in
 
 --libs)
   if test "@libdir@" != "/usr/lib"; then
-    echo "-L@libdir@ -l${LIBNAME}"
+    echo "-L@libdir@ ${LIBNAME}"
   else
-    echo "-l${LIBNAME}"
+    echo "${LIBNAME}"
   fi;;
 
 --cflags)
@@ -43,7 +41,7 @@ case $1 in
   fi;;
 
 --libtool)
-  echo "@libdir@/lib${LIBNAME}.la"
+  echo "@libdir@/lib${LIBTOOLNAME}.la"
   ;;
 
 *)
@@ -57,19 +55,19 @@ cat > /dev/null <<EOF
 /***ja @page m17n-config m17n ¥é¥¤¥Ö¥é¥ê¤Î¥³¥ó¥Ñ¥¤¥ë¡¦¥ê¥ó¥¯¥ª¥×¥·¥ç¥ó¤Îɽ¼¨ */
 
 /***
-@section synopsis SYNOPSIS
+@section m17n-config-synopsis SYNOPSIS
 
-m17n-config [CORE | X] [--cflags | --libs | --libtool] [--version]
+m17n-config [CORE | GUI] [--cflags | --libs | --libtool] [--version]
 
-@section description DESCRIPTION
+@section m17n-config-description DESCRIPTION
 
 The shell script m17n-config prints compile and link options for a
 program that uses the m17n library.
 
 By default, the printed options are for such a program that uses SHELL
 API of the libray.  But, if the first argument is "CORE", the options
-are for a program that uses only CORE API, if the first argument "X",
-the options are for a program that uses GUI API on X window.
+are for a program that uses only CORE API, if the first argument "GUI",
+the options are for a program that uses GUI API.
 
 The other arguments are as follows.
 
@@ -102,5 +100,5 @@ EOF
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with the m17n library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307, USA.
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.