Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 4de07e2c773d6f8f6af160f59ec29afc > files > 2

jboss-web-native-2.0.10-3.mga3.src.rpm

commit b311766bfd4f390542520570ea2d46e1b73dd20d
Author: Juan Hernandez <juan.hernandez@redhat.com>
Date:   Wed Apr 25 20:30:25 2012 +0200

    rename-so-to-jbnative

diff --git a/Makefile.in b/Makefile.in
index fc84eb0..b84e09b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,7 @@ TCNATIVE_LIBS = @TCNATIVE_LIBS@
 
 TARGET_LIB = lib@TCNATIVE_LIBNAME@.la
 EXTRA_OS_LINK=@EXTRA_OS_LINK@
-TCNATIVE_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
+TCNATIVE_PCFILE = jbnative-$(TCNATIVE_MAJOR_VERSION).pc
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -52,7 +52,7 @@ CLEAN_SUBDIRS = test
 
 CLEAN_TARGETS = .make.dirs
 DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
-	build/rules.mk tcnative.pc
+	build/rules.mk jbnative.pc
 EXTRACLEAN_TARGETS = configure aclocal.m4 build-outputs.mk \
 	build/apr_common.m4 build/find_apr.m4 build/install.sh \
 	build/config.guess build/config.sub tcnative.spec
@@ -69,7 +69,7 @@ top_blddir=@abs_builddir@
 install: $(TARGET_LIB)
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
+	$(INSTALL_DATA) jbnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
 	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
 		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
 	done
diff --git a/configure.in b/configure.in
index c816b8b..9650365 100644
--- a/configure.in
+++ b/configure.in
@@ -160,7 +160,7 @@ lib_target=$APR_LIB_TARGET
 AC_SUBST(so_ext)
 AC_SUBST(lib_target)
 
-TCNATIVE_LIBNAME="tcnative${libsuffix}"
+TCNATIVE_LIBNAME="jbnative${libsuffix}"
 AC_SUBST(TCNATIVE_LIBNAME)
 
 EXTRA_OS_LINK=""
@@ -259,7 +259,7 @@ dnl
 dnl everthing is done.
 MAKEFILES="Makefile"
 AC_OUTPUT([
-    tcnative.pc
+    jbnative.pc
     $MAKEFILES
 	],[
 TCNATIVE_MAJOR_VERSION=$TCNATIVE_MAJOR_VERSION
diff --git a/jbnative.pc.in b/jbnative.pc.in
new file mode 100644
index 0000000..d593df1
--- /dev/null
+++ b/jbnative.pc.in
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
+includedir=@includedir@
+
+Name: Tomcat native Java
+Description: Companion Native Java library
+Version: @TCNATIVE_DOTTED_VERSION@
+# assume that tcnative requires libapr of same major version
+Requires: apr-@TCNATIVE_MAJOR_VERSION@
+Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
+Cflags: -I${includedir}
diff --git a/tcnative.pc.in b/tcnative.pc.in
deleted file mode 100644
index d593df1..0000000
--- a/tcnative.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
-includedir=@includedir@
-
-Name: Tomcat native Java
-Description: Companion Native Java library
-Version: @TCNATIVE_DOTTED_VERSION@
-# assume that tcnative requires libapr of same major version
-Requires: apr-@TCNATIVE_MAJOR_VERSION@
-Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
-Cflags: -I${includedir}