New makefile updates.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -937,14 +937,6 @@ esac
 
 AM_PROG_LIBTOOL
 
-dnl ---------------------------------------------------------------------------
-dnl things for shared libraries without libtool
-dnl ---------------------------------------------------------------------------
-
-SHARED_LINKER=gcc -shared 
-SHARED_LINKER_FLAG=
-SHARED_CFLAG=
-
 dnl ---------------------------------------------------------------------------
 dnl Define search path for includes and libraries: all headers and libs will be
 dnl looked for in all directories of this path
@@ -1195,7 +1187,7 @@ dnl the name of the directory where the files for this toolkit live
 TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
 
 dnl the symbol which allows conditional compilation for the given toolkit
-TOOLKIT_DEF=-D__WX${TOOLKIT}__
+TOOLKIT_DEF="-D__WX${TOOLKIT}__"
 
 dnl the name of the (libtool) library
 WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la"
@@ -1203,8 +1195,79 @@ WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la"
 dnl the name of the static library
 WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
 
-dnl the name of the library to be linked reported by wx-config
-WX_LIBRARY="wx_${TOOLKIT_DIR}"
+dnl the name of the shared library
+WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${LT_RELEASE}.so.${LT_CURRENT}.${LT_REVISION}.${LT_AGE}"
+
+dnl the name of the library we actually want to build
+WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+
+dnl the name of the links to the shared library
+WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${LT_RELEASE}.so.${LT_CURRENT}"
+WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${LT_RELEASE}.so"
+WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
+
+dnl shared library settings
+SHARED_LD=
+PIC_FLAG=
+WX_CREATE_LINKS=
+
+case "${host}" in
+  *-hp-hpux* )
+    WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
+    SHARED_LD="${CXX} -b -o"
+    PIC_FLAG="+Z"
+  ;;
+  *-*-linux* )
+    SHARED_LD="${CC} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-irix5* | *-*-irix6* )
+    SHARED_LD="${CXX} -shared -o"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-solaris2* )
+    SHARED_LD="${CXX} -G -o"
+    PIC_FLAG="PIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-sunos4* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-freebsd* | *-*-netbsd*)
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-osf* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-dgux5* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-sysv5* )
+    SHARED_LD="${CXX} -shared -o"
+    PIC_FLAG="-fPIC"
+    WX_CREATE_LINKS="CREATE_LINKS"
+  ;;
+  *-*-aix* )
+    SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
+  ;;
+  *-*-cygwin32* )
+  ;;
+  *-*-mingw32* )
+  ;;
+  *-pc-os2_emx )
+  ;;
+  *)
+    AC_MSG_ERROR(unknown system type ${host}.)
+esac
 
 dnl ------------------------------------------------------------------------
 dnl Check for headers
@@ -2225,12 +2288,24 @@ AC_SUBST(WX_MAJOR_VERSION_NUMBER)
 AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME)
+AC_SUBST(WX_LIBRARY_NAME_STATIC)
+AC_SUBST(WX_LIBRARY_NAME_SHARED)
 AC_SUBST(WX_LIBRARY)
+AC_SUBST(WX_TARGET_LIBRARY)
+AC_SUBST(WX_LIBRARY_LINK1)
+AC_SUBST(WX_LIBRARY_LINK2)
+AC_SUBST(WX_LIBRARY_LINK3)
+
+dnl are we supposed to create the links?
+AC_SUBST(WX_CREATE_LINKS)
 
 dnl suppress libtool's informational messages - they duplicate its command line
 LIBTOOL="$LIBTOOL --silent"
 AC_SUBST(LIBTOOL)
 
+AC_SUBST(SHARED_LD)
+AC_SUBST(PIC_FLAG)
+
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)