remove DYNAMIC_LIB_EXTEN because we use libtool to figure this all out now

diff --git a/Makefile.am b/Makefile.am
index 50f05dcfa26537f96beb91a9de55637bd4c2c5fa..f5c7f2ee86a6f4b98963bcf9d1ff1117a3110998 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -773,7 +773,7 @@ modclean: $(switch_builddir)/modules.conf
        @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean
 
 modwipe:
-       rm -f $(modulesdir)/*.${DYNAMIC_LIB_EXTEN} $(modulesdir)/*.la
+       rm -f $(modulesdir)/*.so $(modulesdir)/*.la $(modulesdir)/*.dll $(modulesdir)/*.dylib
 
 dox:
        cd docs && doxygen $(PWD)/docs/Doxygen.conf

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index 3a27af690a2dd5e23e812003b23e437891047990..9168b1692e32b813361c8e375c6bc9bf0d68ae5b 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -47,7 +47,6 @@ DEFS=@DEFS@
 DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH
 LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
 OSARCH=`uname -s`
-DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
 LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@
 SOLINK = @SOLINK@
 

diff --git a/configure.ac b/configure.ac
index 8dd59c486be7f63dd851ca81fd9fbaf7940757b8..225886bc0bee837b25a788dfd743a93648b11151 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,16 +236,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
 else
     AC_ERROR([Please update configure.in with SOLINK values for your compiler])
 fi
-# set DYNAMIC_LIB_EXTEN
-# we should really be using libtool so we don't need to do this
-case "$host" in
-    *cygwin* | *mingw*)
-        DYNAMIC_LIB_EXTEN="dll"
-    ;;
-    *)
-        DYNAMIC_LIB_EXTEN="so"
-    ;;
-esac
 
 ##
 # detect libtool major version,
@@ -263,7 +253,7 @@ if test -z "$LIBTOOL_MAJOR_VERSION" ; then
 fi
 AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}])
 
-LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN"
+LIBTOOL_LIB_EXTEN=so
 
 if test "${LIBTOOL_MAJOR_VERSION}" = "2" ; then
    LIBTOOL_LIB_EXTEN="la"
@@ -626,7 +616,6 @@ AC_SUBST(ESL_LDFLAGS)
 AC_SUBST(PLATFORM_CORE_LDFLAGS)
 AC_SUBST(PLATFORM_CORE_LIBS)
 AC_SUBST(SOLINK)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
 AC_SUBST(LIBTOOL_LIB_EXTEN)
 
 # Checks for header files.

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index 7c0e4197190c30c4b4b60671634ab5834bf184e7..f6211e58e8a6f9671236a9341ff89dfbf7bbf47f 100644 (file)
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -270,16 +270,16 @@ endif
 dox doxygen:
        doxygen $(FT_SRCDIR)/docs/Doxygen.conf
 
-mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN): libfreetdm.la mod_freetdm/mod_freetdm.c
+mod_freetdm/mod_freetdm.so: libfreetdm.la mod_freetdm/mod_freetdm.c
        $(MAKE) -C mod_freetdm
 
-mod_freetdm: mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN)
+mod_freetdm: mod_freetdm/mod_freetdm.so
 
 mod_freetdm-install: mod_freetdm
        $(MAKE) -C mod_freetdm install
 
 mod_freetdm-clean:
-       @if [ -f mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) ] ; then \
+       @if [ -f mod_freetdm/mod_freetdm.so ] ; then \
                $(MAKE) -C mod_freetdm clean ; \
        fi
 

diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index 0fe9246068b52ce47461f592b09274c6a119e88c..5236ad59209ecd75d5d975cd9e613f40e7fe9e73 100644 (file)
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -120,18 +120,6 @@ if test "${enable_debug}" != "no"; then
 fi
 AC_SUBST([COMP_VENDOR_CFLAGS])
 
-# set DYNAMIC_LIB_EXTEN
-# we should really be using libtool so we don't need to do this
-case "$host" in
-*cygwin* | *mingw*)
-       DYNAMIC_LIB_EXTEN="dll"
-       ;;
-*)
-       DYNAMIC_LIB_EXTEN="so"
-       ;;
-esac
-AC_SUBST([DYNAMIC_LIB_EXTEN])
-
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([m], [cos])

diff --git a/libs/libdingaling/configure.ac b/libs/libdingaling/configure.ac
index dc0ae21bd62a232130df99be2d4038fa9e1ad579..57aa712c84e31a4f347f0696e0666461038bde8f 100755 (executable)
--- a/libs/libdingaling/configure.ac
+++ b/libs/libdingaling/configure.ac
@@ -58,7 +58,6 @@ case "$host" in
                                 new_AM_LDFLAGS=""
                                 IN_LINE=inline
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                 ;;
                 *-darwin*)
                         if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
@@ -66,7 +65,6 @@ case "$host" in
                                 new_AM_CFLAGS="-DMACOSX"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="dylib"
                         IN_LINE=inline
                 ;;
                 x86_64-*-linux-gnu)
@@ -80,7 +78,6 @@ case "$host" in
                                 new_AM_CFLAGS="-fPIC"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                         IN_LINE=inline
                 ;;
                 i*6-*-linux-gnu)
@@ -94,7 +91,6 @@ case "$host" in
                                 new_AM_CFLAGS="-fpic"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                         IN_LINE=inline
                 ;;
                 *)
@@ -108,7 +104,6 @@ case "$host" in
                                 new_AM_CFLAGS="-fPIC"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                         IN_LINE=inline
 esac
 
@@ -125,7 +120,6 @@ fi
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
 AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline])
 
 # Checks for header files.

diff --git a/libs/openzap/Makefile.am b/libs/openzap/Makefile.am
index 2ef8da70ff29438aa8f7a452cf767a68b1091293..6292398eab5e0de27e37906ceb5b75c4e7bd0f85 100644 (file)
--- a/libs/openzap/Makefile.am
+++ b/libs/openzap/Makefile.am
@@ -257,16 +257,16 @@ endif
 dox doxygen:
        cd docs && doxygen $(OZ_SRCDIR)/docs/Doxygen.conf
 
-mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_openzap/mod_openzap.c
+mod_openzap/mod_openzap.so: $(MYLIB) mod_openzap/mod_openzap.c
        cd mod_openzap && make
 
-mod_openzap: mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN)
+mod_openzap: mod_openzap/mod_openzap.so
 
 mod_openzap-install: mod_openzap
        cd mod_openzap && make install
 
 mod_openzap-clean:
-       @if [ -f mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN) ] ; then cd mod_openzap && make clean ; fi
+       @if [ -f mod_openzap/mod_openzap.so ] ; then cd mod_openzap && make clean ; fi
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(PREFIX)

diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac
index c16e11b97f45299ed822a904a3d828538c579495..984a7889276f79ed96f43090b33636f5e3d963fa 100644 (file)
--- a/libs/openzap/configure.ac
+++ b/libs/openzap/configure.ac
@@ -105,22 +105,11 @@ else
     AC_ERROR([Please update configure.in with SOLINK values for your compiler])
 fi
 
-# set DYNAMIC_LIB_EXTEN
-# we should really be using libtool so we don't need to do this
-case "$host" in
-    *cygwin* | *mingw*)
-        DYNAMIC_LIB_EXTEN="dll"
-    ;;
-    *)
-        DYNAMIC_LIB_EXTEN="so"
-    ;;
-esac
 
 DEFAULT_INCLUDES="-I. -I./src/include -I$(srcdir)"
 
 AC_SUBST(SOLINK)
 AC_SUBST(DEFAULT_INCLUDES)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
 
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])

diff --git a/libs/srtp/configure.ac b/libs/srtp/configure.ac
index 3ddc2147b2407a68590ccf449492f7b08d86843c..ba35f8b99519ab51d8d9707301eb4336b1623a88 100644 (file)
--- a/libs/srtp/configure.ac
+++ b/libs/srtp/configure.ac
@@ -54,7 +54,6 @@ case "$host" in
                                 new_AM_LDFLAGS=""
                                 IN_LINE=inline
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                 ;;
                 *-darwin*)
                         if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
@@ -62,7 +61,6 @@ case "$host" in
                                 new_AM_CFLAGS="-DMACOSX"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="dylib"
                 ;;
                 x86_64-*-linux-gnu)
                         if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
@@ -75,7 +73,6 @@ case "$host" in
                                 new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                 ;;
                 i*6-*-linux-gnu)
                         if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
@@ -88,19 +85,16 @@ case "$host" in
                                 new_AM_CFLAGS="-fpic -Wall -O4 -fexpensive-optimizations -funroll-loops"
                                 new_AM_LDFLAGS=""
                         fi
-                        DYNAMIC_LIB_EXTEN="so"
                 ;;
                i*6*-*-freebsd*)
                         SOLINK="-shared -Xlinker -x"
                         new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
                         new_AM_LDFLAGS=""
-                        DYNAMIC_LIB_EXTEN="so"
                ;;
                x86_64-*-freebsd*|amd64-*-freebsd*)
                         SOLINK="-shared -Xlinker -x"
                         new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
                         new_AM_LDFLAGS=""
-                        DYNAMIC_LIB_EXTEN="so"
                ;;
 esac
 
@@ -117,7 +111,6 @@ fi
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
 if test "x$FUNC_DEF" != "x"; then
    AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)])
 fi